step

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyScanStepService.java

@@ -51,7 +51,7 @@ public class MesAssemblyScanStepService extends BaseStepService {
         if (StringUtils.isEmpty(reqBean.getScanInfo())) execSendGuideAndThrowEx(reqBean, resultBean, "请扫描装配件条码!");
 
         //扫描信息置空
-        String scanInfo = reqBean.resetScanInfo(null);
+        String scanInfo = reqBean.resetScanInfo(reqBean.getScanInfo());
 
         MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
 
@@ -59,20 +59,20 @@ public class MesAssemblyScanStepService extends BaseStepService {
         if (!productionProcessContext.getSuccess()) return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
 
         //保存设备当前一轮工序待验证的装配件条码信息
-        productionDispatchContextStepService.saveScanAssemblySnContext(reqBean, getAssemblySnJson(reqBean));
+        productionDispatchContextStepService.saveScanAssemblySnContext(reqBean, getAssemblySnJson(reqBean, scanInfo));
 
         //发送工步内容
-        productionDispatchContextStepService.doSendStepContextMessage(reqBean, reqBean.getScanInfo(), MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN);
+        productionDispatchContextStepService.doSendStepContextMessage(reqBean, scanInfo, MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN);
 
         return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("当前扫描信息装配件条码[%s]!", scanInfo));
 
     }
 
-    private List<MesEquipVariableCollectContext> getAssemblySnJson(StationRequestBean reqBean) {
+    private List<MesEquipVariableCollectContext> getAssemblySnJson(StationRequestBean reqBean, String scanInfo) {
 
         List<MesEquipVariableCollectContext> equipVariableCollectContextList = new ArrayList<>();
 
-        equipVariableCollectContextList.add(new MesEquipVariableCollectContext(reqBean.getOrganizeCode(), reqBean.getScanInfo(), TimeTool.getNowTime(true)));
+        equipVariableCollectContextList.add(new MesEquipVariableCollectContext(reqBean.getOrganizeCode(), scanInfo, TimeTool.getNowTime(true)));
 
         return equipVariableCollectContextList;