订单生产版本回传+已派发的订单不再进行更新

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java

@@ -443,14 +443,6 @@ public class ProOrderServiceImpl implements IProOrderService {
             sapqo.setErdat(maxCreateTime.getCreateTimeStr());//S_ERDAT(创建日期) 例如：20230923
         }
 
-//        //添加调用sap日志
-//        SysSapLog sysSapLog = new SysSapLog();
-//        sysSapLog.setId(IdUtils.fastSimpleUUID());
-//        sysSapLog.setMesssge(sapqo.toString());
-//        sysSapLog.setMethod("syncSAP");
-//        sysSapLog.setReqcode("请求");
-//        sysSapLog.setCreateTime(DateUtils.getNowDate());
-//        proOrderMapper.addSapLog(sysSapLog);
         logger.info("手动订单同步：【参数】"+ JSONObject.toJSONString(sapqo));
          //取>=20230923的sap数据
         R<List<SapProOrder>> rSapProOrder = remoteSapService.shopOrderSync(sapqo);//sap只能同步指定日期的数据
@@ -510,7 +502,7 @@ public class ProOrderServiceImpl implements IProOrderService {
             proOrder.setQuantitySplit(0L);
             ProOrderWorkorder owork = new ProOrderWorkorder();
             owork.setOrderCode(proOrder.getOrderCode());
-            owork.setStatusArray("'w2','w3','w4'");//已派发w1未派w0活动w2报工w3暂停w4
+            owork.setStatusArray("'w1','w2','w3','w4'");//已派发w1未派w0活动w2报工w3暂停w4
             List<ProOrderWorkorder> workOrders = proOrderWorkorderMapper.selectProOrderWorkorderList(owork);
             if (CollectionUtils.isEmpty(workOrders)) {//更新
                 proOrder.setUpdateTime(nowDate);
@@ -529,7 +521,7 @@ public class ProOrderServiceImpl implements IProOrderService {
                 logger.info("=======订单"+proOrder.getOrderCode()+"同步成功");
             }else{
                 failOrder = proOrder.getOrderCode();
-                logger.info("=======订单" + failOrder + "同步失败");
+                logger.info("=======订单"+failOrder+"同步忽略，订单已经派发");
             }
         }
         return failOrder;
@@ -627,7 +619,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 获取班次信息list
-     *
      * @return
      */
     @Override
@@ -638,7 +629,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 通过订单物料code查询工艺list
-     *
      * @param prodCode
      * @return
      */
@@ -650,7 +640,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 通过工艺编码获取设备信息list
-     *
      * @param routeCode
      * @return
      */
@@ -694,7 +683,6 @@ public class ProOrderServiceImpl implements IProOrderService {
 
     /**
      * 通过母订单Code查询级联订单信息并封装
-     *
      * @param orderCode
      * @return
      */
@@ -1094,7 +1082,6 @@ public class ProOrderServiceImpl implements IProOrderService {
         }
         return success();
     }
-
     public static void main(String args[]){
         String arrayStr = "[[\"GX01\",\"LG1\"],[\"GX01\",\"LG2\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]";
         JSONArray jsonArray = JSONArray.parseArray(arrayStr);

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -315,6 +315,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 SapCreateOrder sap = new SapCreateOrder();
                 sap.setWerks(whiteOrder.getFactoryCode());//工厂编码
                 sap.setAufpar("LJ01");//订单类型
+                sap.setVerid(whiteOrder.getAttr2());//生产版本
                 sap.setMatnr(whiteOrder.getProductCode());//物料编号
                 sap.setQuantity(whiteOrder.getQuantitySplit() + "");//数量
                 sap.setDates(DateUtils.parseDateToStr("yyyy-MM-dd", whiteOrder.getProductDate()));//开始时间