裁片功能优化

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesCutRawErrorProofingService.java

@@ -103,7 +103,7 @@ public class MesCutRawErrorProofingService implements IMesCutRawErrorProofingSer
             // 原材料长度
             String lengthStr = valueArray[4];
 
-            Double length;
+            Double length = 0.0;
 
             if (!workOrderCutMaterialMap.containsKey(partNo)) MesPcnException.throwMesBusiException("扫描条码【%s】零件号【%s】不在裁片方案原材料中", model.getSn(), partNo);
 
@@ -119,7 +119,11 @@ public class MesCutRawErrorProofingService implements IMesCutRawErrorProofingSer
                 length = materialSnDb.getSurplusLength();
                 ConvertBean.serviceModelUpdate(materialSnDb, model.getUserName());
             } else {
-                length = Double.parseDouble(lengthStr);
+                try {
+                    length = Double.parseDouble(lengthStr);
+                } catch (NumberFormatException e) {
+                    MesPcnException.throwMesBusiException("条码【%s】长度【%s】无效", lengthStr);
+                }
                 materialSnDb = new MesMaterialSn();
                 ConvertBean.serviceModelInitialize(materialSnDb, model.getUserName());
                 materialSnDb.setOrganizeCode(model.getOrganizeCode());

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

@@ -291,6 +291,7 @@ public class MesWorkOrderCutCheckStepService extends BaseStepService {
 
                 MesWorkOrderCutDetailModel workOrderCutDetailModel = new MesWorkOrderCutDetailModel();
                 BeanUtils.copyProperties(mesCutSchemeFg, workOrderCutDetailModel);
+                workOrderCutDetailModel.setCutWorkOrderNo(cutWorkOrderNo);
 
                 MesCustomerPart customerPart = customerPartService.getMesCustomerPartByPartNo(mesCutSchemeFg.getPartNo(), mesPackingDefine.getCustCode(), reqBean.getOrganizeCode());
 

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

@@ -25,12 +25,14 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description : 保存裁片工单包装条码工步
@@ -83,6 +85,11 @@ public class MesWorkOrderCutPackageSnSaveStepService extends BaseStepService {
             // 从上下文中取出成品列表
             List<MesWorkOrderCutDetailModel> workOrderCutFgDataContextList = productionDispatchContextStepService.getMesWorkOrderCutFgDataContext(reqBean);
 
+            //搜集裁片工单号
+            //List<String> filterList = equipVariableCollectContextList.stream().filter(o -> (null != o)).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList());
+            //List<String> workOrderCutNoList = filterList.stream().filter(o -> (!StringUtils.isEmpty(o) && !o.equals(productionProcessContext.getFinishCode()))).distinct().collect(Collectors.toList());
+            //String cutWorkOrderNo = workOrderCutNoList.stream().findFirst().get();
+
             if (CollectionUtils.isEmpty(workOrderCutFgDataContextList))
                 stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "缺失裁片工单箱条码配置信息!");