Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java

@@ -259,24 +259,24 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                 //转外协业务处理
                 if (WorkOrderRun.RUN_TYPE_1.equals(workOrderRun.getRunType())) {
                     for (WorkPlanRun wpr : wprList) {
-                        WorkPlan wp1 = workPlanMapper.selectById(wpr.getWpId());
+                        wp = workPlanMapper.selectById(wpr.getWpId());
                         //如果不是勾选工序不处理
                         if (!wpr.getHandle()) {
                             continue;
                         }
-                        wp1.setMakeTeam(null);
-                        wp1.setSubsidiaryTeam(null);
-                        wp1.setPlanStartTime(LocalDateTime.ofInstant(
+                        wp.setMakeTeam(null);
+                        wp.setSubsidiaryTeam(null);
+                        wp.setPlanStartTime(LocalDateTime.ofInstant(
                                 wpr.getStartTime().toInstant(),
                                 ZoneId.systemDefault()
                         ));
-                        wp1.setPlanEndTime(LocalDateTime.ofInstant(
+                        wp.setPlanEndTime(LocalDateTime.ofInstant(
                                 wpr.getEndTime().toInstant(),
                                 ZoneId.systemDefault()
                         ));
-                        wp1.setOem("1");
-                        wp1.setCaId(wpr.getCaId());
-                        wpList.add(wp1);
+                        wp.setOem("1");
+                        wp.setCaId(wpr.getCaId());
+                        wpList.add(wp);
                     }
                     wo.setWorId(workOrderRun.getId());
                     workOrderRun.setRunStatus(WorkOrderRun.RUN_STATUS_ISSUED);
@@ -370,12 +370,12 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                         // 返工单号
                         if (craftId != null && wo.getReworkCode() == null) {
                             Map<String, String> craftInfo = baseMapper.selectRoamAndCraftNoByCraftId(craftId);
-                            roamNo = craftInfo.get("roamNo");
-                            craftNo = craftInfo.get("craftNo");
+                            roamNo = craftInfo.get("ROAMNO");
+                            craftNo = craftInfo.get("CRAFTNO");
                             if (roamNo == null) {
                                 craftInfo = baseMapper.selectRoamAndCraftNoByPartCode(yo.getPartCode());
-                                roamNo = craftInfo.get("roamNo");
-                                craftNo = craftInfo.get("craftNo");
+                                roamNo = craftInfo.get("ROAMNO");
+                                craftNo = craftInfo.get("CRAFTNO");
                             }
                         } else if (StringUtils.isNotBlank(wo.getReworkCode())) {
                             roamNo = wo.getReworkCode();
@@ -541,7 +541,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
             WorkPlan currentPlan = new WorkPlan();
             currentPlan.setId(workPlan.getId());
             currentPlan.setFactEndTime(date);
-            currentPlan.setStatus(5);
+            currentPlan.setStatus(WorkPlan.STATUS_COMPLETE);
             currentPlan.setWxNo(wxCode);
             workPlanMapper.updateById(currentPlan);
 
@@ -552,13 +552,14 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
             WorkPlan currentPlan = new WorkPlan();
             currentPlan.setId(workPlan.getId());
             currentPlan.setFactStartTime(date);
-            currentPlan.setStatus(2);
+            currentPlan.setStatus(WorkPlan.STATUS_START);
             currentPlan.setWxNo(wxCode);
             workPlanMapper.updateById(currentPlan);
         }
 
         workOrder.setOemOut(String.valueOf(1));
         workOrder.setPickingStatus(1);
+        workOrder.setRunStatus(WorkOrder.RUN_STATUS_RECEIVE);
     }
 
     @Transactional(rollbackFor = Exception.class)

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataOemServiceImpl.java

@@ -143,9 +143,9 @@ public class ErpDataOemServiceImpl implements IErpDataOemService {
                         new SqlParameter("v_roam_no", Types.VARCHAR),   // IN
                         new SqlParameter("v_craft_no", Types.VARCHAR),   // IN
                         new SqlParameter("v_craft_id", Types.BIGINT),   // IN
+                        new SqlOutParameter("v_old_wono", Types.VARCHAR),// OUT
                         new SqlOutParameter("v_excnote", Types.VARCHAR), // OUT
-                        new SqlOutParameter("v_excflag", Types.VARCHAR), // OUT
-                        new SqlOutParameter("v_old_wono", Types.VARCHAR) // OUT
+                        new SqlOutParameter("v_excflag", Types.VARCHAR) // OUT
                 );
         // 2. 封装输入参数
         Map<String, Object> inParams = new HashMap<>();
@@ -155,7 +155,7 @@ public class ErpDataOemServiceImpl implements IErpDataOemService {
         inParams.put("v_woporqty", v_woporqty);
         inParams.put("v_usedept", v_usedeptcode != null ? v_usedeptcode : v_usedept);
         inParams.put("v_splcode", v_splcode);
-        inParams.put("v_splycode", v_planner);
+        inParams.put("v_splycode", v_splycode);
         inParams.put("v_kdofplat", v_kdofplat);
         inParams.put("v_wono", v_wono);
         inParams.put("v_sono", v_sono);