入库

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -19,6 +19,7 @@ import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
 import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.apache.cxf.endpoint.Client;
@@ -441,6 +442,9 @@ public class FbsWorkingStatisticsController {
 		 entity.setFinalInfo("实时报工");
 		 entity.setPkWorkshopDispatchList(workshopDispatchList.getId());
 		 entity.setFinalState("3");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
+		 entity.setId(list2.get(0).getId());
+
+
 		 fbsWorkingStatisticsService.updateById(entity);
          fbsWorkshopDispatchListService.updateState("3",entity.getPkWorkshopDispatchList());
 
@@ -457,17 +461,29 @@ public class FbsWorkingStatisticsController {
 				 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
 			 }
 		 }
-
-		 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(),entity.getPkWorkshopDispatchList());
+		 if(allHors.doubleValue()>8.0){//超过八小时按照8小时计算
+			 allHors=new BigDecimal("8.0");
+		 }
 
          if(entity.getState().equals("1")){
-         	//把数据传入u8数据库
-			 Map<String,Object> map=saveU8(entity,workshopDispatchList,allHors);
-			 Object objects=map.get("result");
-			 res.setCode("0");
-			 res.setMsg(objects.toString());
-			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+			 //把数据传入u8数据库
+			 Object[] objectR=saveU8(entity,workshopDispatchList,allHors);
+			 Map map= JSONObject.parseObject(objectR[0].toString());
+			 if(map.get("Result").equals("F")){
+				 FbsWorkingStatistics fbsWorkingStatistics=new FbsWorkingStatistics();
+				 fbsWorkingStatistics.setId(list2.get(0).getId());
+				 fbsWorkingStatistics.setState("0");
+				 fbsWorkingStatistics.setFinalState("1");
+				 fbsWorkingStatistics.setWorkingHours(new BigDecimal("0.0"));
+				 fbsWorkingStatistics.setQualifiedNumber("0");
+				 fbsWorkingStatisticsService.updateById(fbsWorkingStatistics);
+				 fbsWorkshopDispatchListService.updateState("1",entity.getPkWorkshopDispatchList());
+				 res.setCode("1");
+				 res.setMsg(map.get("Description").toString());
+				 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+			 }
 		 }
+		 fbsWorkshopDispatchListService.writeBackManHoursCompleted(allHors.toString(),allNum.toString(),entity.getPkWorkshopDispatchList());
 
          res.setCode("0");
 		 res.setMsg("成功");
@@ -476,8 +492,8 @@ public class FbsWorkingStatisticsController {
 	 }
 
 	//入库接口
-	 public Map<String, Object> saveU8(FbsWorkingStatistics entity,FbsWorkshopDispatchList workshopDispatchList,BigDecimal allHors){
-		 Map<String, Object> mapR=new LinkedHashMap<>();
+	 public Object[] saveU8(FbsWorkingStatistics entity,FbsWorkshopDispatchList workshopDispatchList,BigDecimal allHors){
+		 Object[] mapR=new Object[]{};
 	 	if(StringUtils.isNotBlank(entity.getBatchCode())){
 			String[] batchCodes=entity.getBatchCode().split(",");//解析逗号分隔的批号
 			List<Map<String,Object>> mapList=new ArrayList<>();
@@ -520,7 +536,7 @@ public class FbsWorkingStatisticsController {
 	 }
 
 	 //调用WebService接口
-	 public Map<String, Object> getWebService(Map<String,Object> mapR) {
+	 public Object[] getWebService(Map<String,Object> mapR) {
 //		 if (args.length < 1) {
 //			 args = new String[]{""};
 //		 }
@@ -535,17 +551,19 @@ public class FbsWorkingStatisticsController {
 		 // 命名空间，方法名
 		 QName name = new QName("http://tempuri.org/", "U8_CreateRdrecord10");
 		 HashMap<String, Object> map = new HashMap<>();
+		 Object[] objectR=new Object[]{};
 		 try {
 			 // invoke("方法名",参数1,参数2,参数3....);
 			 Object[] objects = client.invoke(name, jsonObject);
 			 map.put("result", objects);
 			 System.out.println(map.get("result"));
 			 System.out.println(Arrays.toString(objects));
-			 return map;
+			 objectR=objects;
+			 return objectR;
 		 } catch (java.lang.Exception e) {
 			 e.printStackTrace();
 			 map.put("result", "接口调用异常");
-			 return map;
+			 return objectR;
 		 }
 	 }
 

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -286,22 +286,23 @@
     <select id="getProductList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
         SELECT
             fwdl.production_order_number_name,
-            fws.end_date,
+            <!--fws.end_date,-->
             fwdl.product,
             fwdl.product_id,
             fwdl.planned_start_time,
             fwdl.planned_end_time,
             fwdl.number_of_tasks,
-            fws.qualified_number,
-            fwdl.product_id
+        <!--fws.qualified_number,-->
+            fwdl.product_id,
+            fwdl.latest_completed_quantity
         FROM
           fbs_workshop_dispatch_list fwdl
-        LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
-          AND fws.del_flag = '0'
+        <!--LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
+          AND fws.del_flag = '0'-->
         WHERE
-            fwdl.del_flag = '0'
-            and fwdl.state <![CDATA[ <> ]]> '0'
-            <!--and date_format( fwdl.date, '%Y-%m-%d' ) = date_format( now( ), '%Y-%m-%d' )-->
+        fwdl.del_flag = '0'
+        and fwdl.state <![CDATA[ <> ]]> '0'
+        <!--and date_format( fwdl.date, '%Y-%m-%d' ) = date_format( now( ), '%Y-%m-%d' )-->
         ORDER BY
             fwdl.date DESC
             LIMIT 6