报工时无法提交损耗物料数量问题修复

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -251,4 +251,6 @@ public interface MesReportWorkMapper {
     BigDecimal selectWmsProductPut(MesReportWork mesReportWork1);
 
     List<Map<String,Object>> selectRecordDnbInstantByTime (Map<String, Object> query);
+
+    void updateAttr2AndRspos(MesReportWorkConsume params);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java

@@ -254,9 +254,23 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
             logger.info(workorder.getWorkorderCode()
                     + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR));
             if(bomUpdateR.getCode() == 200){
-                //attr2 0->1组件完成修改
-                int f = mesReportWorkMapper.updateAttr2(workorder);
-                logger.info("组件修改完成："+f);
+                if (bomUpdateR.getData() != null) {
+                    Map<String,Object> data = (Map<String, Object>) bomUpdateR.getData();
+                    if (data.get("items") != null) {
+                        List<Map<String,String>> items = (List<Map<String,String>>) data.get("items");
+                        for (Map<String,String> item : items) {
+                            MesReportWorkConsume params = new MesReportWorkConsume();
+                            params.setMaterialCode(item.get("matnr"));
+                            params.setWorkorderCode(workorder.getWorkorderCode());
+                            params.setRspos(item.get("code"));
+                            mesReportWorkMapper.updateAttr2AndRspos(params);
+                        }
+                        //attr2 0->1组件完成修改
+//                        int f = mesReportWorkMapper.updateAttr2(workorder);
+                        logger.info("组件修改完成：");
+                    }
+                }
+
             }
             return bomUpdateR;
         }

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -1844,4 +1844,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		ORDER BY
 		collect_time ASC;
 	</select>
+
+	<update id="updateAttr2AndRspos" parameterType="com.op.mes.domain.MesReportWorkConsume">
+		update mes_report_work_consume
+		set attr2 = '1', rspos = #{rspos}
+		where parent_order = #{workorderCode} and attr1= '1' and material_code = #{materialCode} and attr2 = '0'
+	</update>
+
 </mapper>

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java

@@ -628,6 +628,8 @@ public class SapOrderServiceImpl implements SapOrderService {
 
     @Override
     public R shopOrderBomUpdate(List<Map<String, Object>> mapList) {
+        Map<String,Object> result = new HashMap<>();
+        List<Map<String,String>> items = new ArrayList<>();
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -661,6 +663,10 @@ public class SapOrderServiceImpl implements SapOrderService {
                 if (Constants.SUCCESS.equals(Integer.parseInt(RETCODE))){
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、物料："+m.get("P_MATNR")+L_MSG);
+                    Map<String, String> map = new HashMap<>();
+                    map.put("matnr", (String) m.get("P_MATNR"));
+                    map.put("code", func.getExportParameterList().getString("NEXT_RSPOS"));
+                    items.add(map);
                 }else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、物料 " +m.get("P_MATNR")+L_MSG);
@@ -678,7 +684,9 @@ public class SapOrderServiceImpl implements SapOrderService {
         } else {
             successMsg.insert(0, "恭喜您，添加SAP组件成功！共 " + successNum + " 条，数据如下：");
         }
-        return R.ok(successMsg);
+        result.put("msg",successMsg);
+        result.put("items",items);
+        return R.ok(result);
     }