报工功能演示修改

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java

@@ -15,6 +15,8 @@ public interface IMesWorkOrderService extends IBaseMesService<MesWorkOrder> {
 
     void doProductReportExt(MesWorkOrder mesWorkOrder);
 
+    void deleteUnSortOrder(String userName,String organizeCode);
+
     List<MesWorkOrder> sumMesWorkOrderQtyToSap(String organizeCode);
 
     List<MesWorkOrder> queryMesWorkOrderProcessToSap(String organizeCode);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java

@@ -48,7 +48,7 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
             String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
             //非排序工单导入前删除
             if (MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue() == type) {
-
+                mesWorkOrderService.deleteUnSortOrder(userName,organizeCode);
             }
             // 导入数据初始化
             for (MesWorkOrder bean : beanList) {

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -629,7 +629,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                     }
                     //成品移库
                     if(isMove){
-                        MesMove move = createMove(mesPartSap, mesProdRuleSortCfg.getSrcErpLocation(), mesProdRuleSortCfg.getDestErpLocation(), mesWorkOrder.getOrganizeCode(), 1d);
+                        MesMove move = createMove(mesPartSap, mesProdRuleSortCfg.getSrcErpLocation(), mesProdRuleSortCfg.getDestErpLocation(), mesWorkOrder.getOrganizeCode(), 1d,sn);
                         move.setMatnr(mesWorkOrder.getPartNo());
                         mesMoveList.add(move);
                     }
@@ -661,6 +661,16 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
     }
 
+    @Override
+    public void deleteUnSortOrder(String userName, String organizeCode) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue(),"workOrderType",ddlPackBean);
+        DdlPreparedPack.getStringSmallerNotEqualPack(TimeTool.getToday(),"planStartTime",ddlPackBean);
+        DdlPreparedPack.getNumberSmallerPack(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue(),"workOrderStatus",ddlPackBean);
+        baseRDao.updateByProperties(new String[]{"modifyUser", "modifyDatetime","workOrderStatus"},
+                new Object[]{userName, TimeTool.getNowTime(true),MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()},ddlPackBean);
+    }
+
     private void customerSupplyMove(MesWorkOrder mesWorkOrder, MesProductVersion mesProductVersion, List<MesBom> mesBoms, List<String> resultList, List<MesProductOffLine> mesProductOffLineList, List<MesMove> mesMoveList) {
         boolean isItemMove;
         boolean isItemReport;
@@ -702,7 +712,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                     if(mesPartSapMap.containsKey(mesBom.getItemPartNo())){
                         mesPartSap = mesPartSapMap.get(mesBom.getItemPartNo()).iterator().next();
                     }
-                    MesMove move = createMove(mesPartSap, moveRule.getErpSrcLocateNo(), moveRule.getErpDestLocateNo(), mesBom.getOrganizeCode(), mesBom.getItemQty());
+                    MesMove move = createMove(mesPartSap, moveRule.getErpSrcLocateNo(), moveRule.getErpDestLocateNo(), mesBom.getOrganizeCode(), mesBom.getItemQty(),sn);
                     move.setMatnr(mesBom.getItemPartNo());
                     mesMoveList.add(move);
                 }
@@ -815,7 +825,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         return mesWorkOrderRDao.findByHqlWhere(packBean);
     }
 
-    private MesMove createMove(MesPartSap mesPart , String source, String target, String org,double qty) {
+    private MesMove createMove(MesPartSap mesPart , String source, String target, String org,double qty,String sn) {
         MesMove move = new MesMove();
         if(!Objects.isNull(mesPart)){
             move.setMeins(mesPart.getUnit());
@@ -826,6 +836,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         move.setUmlgo(target);
         move.setMenge(qty);
         move.setPostDate(TimeTool.getToday());
+        move.setProductSn(sn);
         move.setPostTime(TimeTool.getTimeShortWithColon());
         ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName());
         return move;