chenc 4 år sedan
förälder
incheckning
9c21409438

+ 13 - 0
src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -7,6 +7,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -446,6 +447,7 @@ public class FbsWorkingStatisticsController {
 
          if(entity.getState().equals("1")){
          	//把数据传入u8数据库
+
 		 }
 
          res.setCode("0");
@@ -454,6 +456,17 @@ public class FbsWorkingStatisticsController {
 		 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 	 }
 
+
+	 public void saveU8(FbsWorkingStatistics entity,FbsWorkshopDispatchList workshopDispatchList){
+	 	Map<String,Object> map=new HashMap<>();
+		map.put("CVOUCHCODE",entity.getOrderNumber());//单号
+		 Date date=new Date();
+		 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		 map.put("DDATE",sdf.format(date));//入库日期
+
+
+	 }
+
 	 /**
 	  * 通过人员编码查询人员信息
 	  * @param userId

+ 27 - 2
src/main/java/org/jeecg/modules/fbsDispatchLists/mapper/xml/FbsDispatchListsMapper.xml

@@ -17,7 +17,7 @@
     </select>
 
     <select id="getMonthSendByProject" resultType="org.jeecg.modules.fbsDispatchLists.entity.FbsDispatchLists">
-        SELECT
+       <!-- SELECT
             DispatchList.months AS months,
             count( DispatchList.cItemCode ) AS itemCount
         FROM
@@ -40,6 +40,31 @@
         GROUP BY
             DispatchList.months
         ORDER BY
-            months
+            months -->
+        SELECT
+        rd.months AS months,
+        count( rd.cItemCode ) AS itemCount
+        FROM
+        (
+        SELECT
+        count( ds.cItemCode ) cItemCode,
+        substring( d.cBusCode, 5, 2 ) months
+        FROM
+        rdrecords32 ds
+        LEFT JOIN rdrecord32 d ON ds.ID = d.ID
+        WHERE
+        substring( d.cBusCode, 3, 2 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 2 )
+        AND d.cSTCode='01'
+        AND ds.cItemCode <![CDATA[ <> ]]> '0002'
+        and isnull(d.cMemo,'')  <![CDATA[<> ]]> '%补发货%'
+        GROUP BY
+        ds.cItemCode,
+        substring( d.cBusCode, 5, 2 )
+        ) AS rd
+        GROUP BY
+        rd.months
+        ORDER BY
+        months
+
     </select>
 </mapper>