报工组件修改9

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

@@ -142,4 +142,6 @@ public interface MesReportWorkMapper {
     List<MesReportWorkConsume> getWarehouseList(MesReportWorkConsume workConsume);
 
     List<MesReportWorkConsume> getUpdateAttr1Boms(MesReportWork workorderCode);
+
+    int updateAttr2(MesReportWork workorder);
 }

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

@@ -252,9 +252,14 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
             R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList);
             logger.info(workorder.getWorkorderCode()
                     + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR));
+            if(bomUpdateR.getCode() == 200){
+                //attr2 0->1组件完成修改
+                int f = mesReportWorkMapper.updateAttr2(workorder);
+                logger.info("组件修改完成："+f);
+            }
             return bomUpdateR;
         }
-        return R.fail();
+        return R.ok();
     }
 
     @Override

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

@@ -688,7 +688,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   mrwc.warehouse_code warehouseCode
 		from mes_report_work_consume mrwc
 		left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code
-		where mrwc.attr1 = '1' and mrwc.del_flag = '0'
+		where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0'
 		  and mrwc.parent_order = #{workorderCode}
 	</select>
 
@@ -877,8 +877,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			upload_msg = null
 		where workorder_code = #{workorderCode} or parent_order = #{workorderCode}
 	</update>
+	<update id="updateAttr2">
+		update mes_report_work_consume
+           set attr2 = '1'
+		where parent_order = #{workorderCode} and attr1= '1'
+	</update>
 
-    <delete id="deleteMesReportWorkById" parameterType="String">
+	<delete id="deleteMesReportWorkById" parameterType="String">
 		update mes_report_work set del_flag = '1' where id = #{id}
 	</delete>