工单 生产顺序号 字段 pojo 属性名变更 数据库字段不变

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java

@@ -20,10 +20,10 @@ public interface IMesWorkOrderExtService {
     MesWorkOrder getWorkOrder(String organizeCode, String workOrderNo);
 
     @ApiOperation(value = "根据生产工单顺序号,生产线代码查询上一个生产工单信息")
-    MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long produceSeq);
+    MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long productSeq);
 
     @ApiOperation(value = "根据生产工单顺序号,生产线代码, 零件生产组代码查询上一个生产工单信息【排序】")
-    MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long produceSeq, String partProdGroupCode);
+    MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long productSeq, String partProdGroupCode);
 
     @ApiOperation(value = "根据生产线代码, 零件生产组代码查询生产工单信息【排序】")
     List<MesWorkOrder> getWorkOrderList(String organizeCode, String workCenterCode, String partProdGroupCode);

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

@@ -71,24 +71,24 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService {
 
     //根据生产工单顺序号,生产线代码查询上一个生产工单信息
     @Override
-    public MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long produceSeq) {
+    public MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long productSeq) {
-        if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || (StringUtils.isEmpty(produceSeq) || produceSeq.compareTo(0L) == 0)) return null;
+        if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || (StringUtils.isEmpty(productSeq) || productSeq.compareTo(0L) == 0)) return null;
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(workCenterCode, MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
-        DdlPreparedPack.getNumberSmallerPack(produceSeq, MesPcnExtConstWords.PRODUCE_SEQ, packBean);
+        DdlPreparedPack.getNumberSmallerPack(productSeq, MesPcnExtConstWords.PRODUCT_SEQ, packBean);
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesPcnExtConstWords.PRODUCE_SEQ}, packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesPcnExtConstWords.PRODUCT_SEQ}, packBean);
         return workOrderRepository.getByProperty(packBean);
     }
 
     //根据生产工单顺序号,生产线代码,零件生产组代码查询上一个生产工单信息
     @Override
-    public MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long produceSeq, String partProdGroupCode) {
+    public MesWorkOrder getWorkOrder(String organizeCode, String workCenterCode, Long productSeq, String partProdGroupCode) {
-        if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || StringUtils.isEmpty(partProdGroupCode) || StringUtils.isEmpty(produceSeq) || produceSeq.compareTo(0L) == 0) return null;
+        if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || StringUtils.isEmpty(partProdGroupCode) || StringUtils.isEmpty(productSeq) || productSeq.compareTo(0L) == 0) return null;
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(workCenterCode, MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
         DdlPreparedPack.getStringEqualPack(partProdGroupCode, MesPcnExtConstWords.PART_PROD_GROUP_CODE, packBean);
-        DdlPreparedPack.getNumberSmallerPack(produceSeq, MesPcnExtConstWords.PRODUCE_SEQ, packBean);
+        DdlPreparedPack.getNumberSmallerPack(productSeq, MesPcnExtConstWords.PRODUCT_SEQ, packBean);
-        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesPcnExtConstWords.PRODUCE_SEQ}, packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{MesPcnExtConstWords.PRODUCT_SEQ}, packBean);
         return workOrderRepository.getByProperty(packBean);
     }
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionSortModuleService.java

@@ -86,7 +86,7 @@ public class MesProductionSortModuleService extends BaseModuleService {
         this.sendMessage(reqBean, resultBean);
 
         // 获取当前工位最新修改的完成状态的队列单据数据 并根据其零件生产组代码按生产序号倒序前50条
-        resultBean = getStationResultBean(queryQueueOrderTopFiftyProduceSeq(reqBean, getNewPartProdGroupCode(reqBean, productionPartContext)));
+        resultBean = getStationResultBean(queryQueueOrderTopFiftyProductSeq(reqBean, getNewPartProdGroupCode(reqBean, productionPartContext)));
         this.sendMessage(reqBean, resultBean);
 
         //验证工位是否锁定
@@ -115,7 +115,7 @@ public class MesProductionSortModuleService extends BaseModuleService {
         return attrBeanList;
     }
 
-    private List<MesQueueOrderModel> queryQueueOrderTopFiftyProduceSeq(StationRequestBean reqBean, List<String> partProdGroupCodeList) {
+    private List<MesQueueOrderModel> queryQueueOrderTopFiftyProductSeq(StationRequestBean reqBean, List<String> partProdGroupCodeList) {
 
         if (CollectionUtils.isEmpty(partProdGroupCodeList)) return new ArrayList<>();
 
@@ -129,7 +129,7 @@ public class MesProductionSortModuleService extends BaseModuleService {
             DdlPreparedPack.getStringEqualPack(reqBean.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
             DdlPreparedPack.getStringEqualPack(reqBean.getWorkCellCode(), MesPcnExtConstWords.WORK_CELL_CODE, packBean);
             DdlPreparedPack.getStringEqualPack(partProdGroupCode, MesPcnExtConstWords.PART_PROD_GROUP_CODE, packBean);
-            packBean.setOrderByStr(" order by produceSeq desc ");
+            packBean.setOrderByStr(" order by productSeq desc ");
             List<MesQueueOrder> queueOrderList = queueOrderRepository.findByHqlWherePage(packBean, pager);
 
             //List<MesQueueOrderModel> queueOrderModels = new ArrayList<>();

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

@@ -29,8 +29,8 @@ import java.util.stream.Collectors;
  * @Author : wangjie
  **/
 @Slf4j
-@Service("mesProduceSeqCheckCustOrderNoStepService")
+@Service("mesProductSeqCheckCustOrderNoStepService")
-public class MesProduceSeqCheckCustOrderNoStepService extends MesProduceSeqCheckStepService {
+public class MesProductSeqCheckCustOrderNoStepService extends MesProductSeqCheckStepService {
 
     @Autowired
     private IMesWorkOrderExtService workOrderExtService;
@@ -64,7 +64,7 @@ public class MesProduceSeqCheckCustOrderNoStepService extends MesProduceSeqCheck
         if (!checkIsExistWorkOrder(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前无加工单信息,无需进行加工单客户订单号顺序防错验证!");
 
         //验证工位是否设置需要顺序防错
-        if (!isNeedCheckProduceSeq(productionPartContextList))
+        if (!isNeedCheckProductSeq(productionPartContextList))
             return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("生产线[%s]工位[%s]未设置顺序防错,无需进行加工单客户订单号顺序防错验证!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode()));
 
         //验证是否存在工艺强过码, 存在则保存 并返回强过的加工单
@@ -73,10 +73,10 @@ public class MesProduceSeqCheckCustOrderNoStepService extends MesProduceSeqCheck
             return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog().scanInfo(workOrderNoList2Jump.toString()), stepResult, String.format("加工单%s跳过客户订单号顺序防错验证成功!", workOrderNoList2Jump.toString()));
 
         //验证是否已经全部通过
-        if (!isExistNeedCheckProduceSeq2Custom(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "加工单均已通过客户订单号顺序防错验证!");
+        if (!isExistNeedCheckProductSeq2Custom(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "加工单均已通过客户订单号顺序防错验证!");
 
         //顺序防错验证处理
-        doHandleProduceSeqCheck(reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList);
+        doHandleProductSeqCheck(reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList);
 
         return stepResult;
 
@@ -108,14 +108,14 @@ public class MesProduceSeqCheckCustOrderNoStepService extends MesProduceSeqCheck
     }
 
     //验证是否已经全部通过
-    private Boolean isExistNeedCheckProduceSeq2Custom(List<MesProductionPartContext> productionPartContextList) {
+    private Boolean isExistNeedCheckProductSeq2Custom(List<MesProductionPartContext> productionPartContextList) {
         Optional<MesProductionPartContext> optional = productionPartContextList.stream().filter(o -> (null != o &&
                 o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0 && !StringUtils.isEmpty(o.getCustOrderNo()) && o.getCustomCheckSeqResult().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0)).findFirst();
         return (null == optional || !optional.isPresent()) ? false : true;
     }
 
     //顺序防错验证处理
-    private void doHandleProduceSeqCheck(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, List<MesProductionPartContext> productionPartContextList) {
+    private void doHandleProductSeqCheck(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, List<MesProductionPartContext> productionPartContextList) {
 
         List<String> workOrderNoList = new ArrayList<>();
 
@@ -124,7 +124,7 @@ public class MesProduceSeqCheckCustOrderNoStepService extends MesProduceSeqCheck
             if (null == productionPartContext || StringUtils.isEmpty(productionPartContext.getWorkOrderNo()) || productionPartContext.getCheckSeqResult().compareTo(MesPcnExtConstWords.ZERO) != 0) continue;
 
             //顺序防错验证
-            Boolean result = doProduceSeqCheckSort(reqBean, stepResult, productionProcessContext, productionPartContext);
+            Boolean result = doProductSeqCheckSort(reqBean, stepResult, productionProcessContext, productionPartContext);
 
             //验证失败需要同时标记【checkSeqResult】,但验证成功不需要标记【checkSeqResult】
             if (result) productionPartContext.customCheckSeqResult(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
@@ -143,7 +143,7 @@ public class MesProduceSeqCheckCustOrderNoStepService extends MesProduceSeqCheck
     }
 
     //前道工艺防错验证 【排序客户订单号】
-    private Boolean doProduceSeqCheckSort(StationRequestBean reqBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesProductionPartContext productionPartContext) {
+    private Boolean doProductSeqCheckSort(StationRequestBean reqBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesProductionPartContext productionPartContext) {
 
         if (StringUtils.isEmpty(productionPartContext.getCustOrderNo()) || productionPartContext.getCustOrderNo().length() <= 3) return true;
 

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

@@ -30,8 +30,8 @@ import java.util.stream.Collectors;
  * @Author : wangjie
  **/
 @Slf4j
-@Service("mesProduceSeqCheckNosortStepService")
+@Service("mesProductSeqCheckNosortStepService")
-public class MesProduceSeqCheckNosortStepService extends MesProduceSeqCheckStepService {
+public class MesProductSeqCheckNosortStepService extends MesProductSeqCheckStepService {
 
     @Autowired
     private IMesWorkOrderExtService workOrderExtService;
@@ -65,7 +65,7 @@ public class MesProduceSeqCheckNosortStepService extends MesProduceSeqCheckStepS
         if (!checkIsExistWorkOrder(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前无加工单信息,无需进行加工单顺序防错验证!");
 
         //验证工位是否设置需要顺序防错
-        if (!isNeedCheckProduceSeq(productionPartContextList))
+        if (!isNeedCheckProductSeq(productionPartContextList))
             return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("生产线[%s]工位[%s]未设置顺序防错,无需进行加工单顺序防错验证!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode()));
 
         //验证是否存在工艺强过码, 存在则保存 并返回强过的加工单
@@ -74,10 +74,10 @@ public class MesProduceSeqCheckNosortStepService extends MesProduceSeqCheckStepS
             return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog().scanInfo(workOrderNoList2Jump.toString()), stepResult, String.format("加工单%s跳过顺序防错验证成功!", workOrderNoList2Jump.toString()));
 
         //验证是否已经全部通过
-        if (!isExistNeedCheckProduceSeq(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "加工单均已通过顺序防错验证!");
+        if (!isExistNeedCheckProductSeq(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "加工单均已通过顺序防错验证!");
 
         //顺序防错验证处理
-        doHandleProduceSeqCheck(reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList);
+        doHandleProductSeqCheck(reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList);
 
         //删除手动选择的腔数及工单信息上下文
         if (!stepResult.isCompleted()) productionProcessContextStepService.removeFunctionChooseCavityOrderContext(reqBean);
@@ -94,8 +94,8 @@ public class MesProduceSeqCheckNosortStepService extends MesProduceSeqCheckStepS
 
     }
 
-    //顺序防错验证处理
+    //顺序防错验证处理h
-    private void doHandleProduceSeqCheck(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, List<MesProductionPartContext> productionPartContextList) {
+    private void doHandleProductSeqCheck(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, List<MesProductionPartContext> productionPartContextList) {
 
         List<String> workOrderNoList = new ArrayList<>();
 
@@ -104,7 +104,7 @@ public class MesProduceSeqCheckNosortStepService extends MesProduceSeqCheckStepS
             if (null == productionPartContext || StringUtils.isEmpty(productionPartContext.getWorkOrderNo()) || productionPartContext.getCheckSeqResult().compareTo(MesPcnExtConstWords.ZERO) != 0) continue;
 
             //顺序防错验证
-            Boolean result = doProduceSeqCheckNosort(reqBean, stepResult, productionProcessContext, productionPartContext);
+            Boolean result = doProductSeqCheckNosort(reqBean, stepResult, productionProcessContext, productionPartContext);
 
             productionPartContext.checkSeqResult(!result ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
@@ -121,19 +121,19 @@ public class MesProduceSeqCheckNosortStepService extends MesProduceSeqCheckStepS
     }
 
     //前道工艺防错验证 【非排序】
-    private Boolean doProduceSeqCheckNosort(StationRequestBean reqBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesProductionPartContext productionPartContext) {
+    private Boolean doProductSeqCheckNosort(StationRequestBean reqBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesProductionPartContext productionPartContext) {
 
         String message = StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg() + MesPcnExtConstWords.SEMICOLON;
 
         //根据生产工单顺序号,生产线代码查询上一个生产工单信息
-        MesWorkOrder workOrder = workOrderExtService.getWorkOrder(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), productionPartContext.getProduceSeq());
+        MesWorkOrder workOrder = workOrderExtService.getWorkOrder(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), productionPartContext.getProductSeq());
 
         if (null == workOrder) return true;
 
         if (workOrder.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()) >= 0) return true;
 
         return stepResult.isCompleted(false).msg(String.format("%s加工单[%s]生产顺序号[%s]顺序防错验证失败,前一个加工单[%s]生产顺序号[%s]工单状态[%s]",
-                message, productionPartContext.getWorkOrderNo(), productionPartContext.getProduceSeq(), workOrder.getWorkOrderNo(), workOrder.getProduceSeq(), MesExtEnumUtil.ORDER_STATUS.valueOfDescription(workOrder.getWorkOrderStatus()))).isCompleted();
+                message, productionPartContext.getWorkOrderNo(), productionPartContext.getProductSeq(), workOrder.getWorkOrderNo(), workOrder.getProductSeq(), MesExtEnumUtil.ORDER_STATUS.valueOfDescription(workOrder.getWorkOrderStatus()))).isCompleted();
 
     }
 

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

@@ -32,8 +32,8 @@ import java.util.stream.Collectors;
  * @Author : wangjie
  **/
 @Slf4j
-@Service("mesProduceSeqCheckSortStepService")
+@Service("mesProductSeqCheckSortStepService")
-public class MesProduceSeqCheckSortStepService extends MesProduceSeqCheckStepService {
+public class MesProductSeqCheckSortStepService extends MesProductSeqCheckStepService {
 
     @Autowired
     private IMesWorkOrderExtService workOrderExtService;
@@ -67,7 +67,7 @@ public class MesProduceSeqCheckSortStepService extends MesProduceSeqCheckStepSer
         if (!checkIsExistWorkOrder(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前无加工单信息,无需进行加工单顺序防错验证!");
 
         //验证工位是否设置需要顺序防错
-        if (!isNeedCheckProduceSeq(productionPartContextList))
+        if (!isNeedCheckProductSeq(productionPartContextList))
             return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("生产线[%s]工位[%s]未设置顺序防错,无需进行加工单顺序防错验证!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode()));
 
         //验证是否存在工艺强过码, 存在则保存 并返回强过的加工单
@@ -76,17 +76,17 @@ public class MesProduceSeqCheckSortStepService extends MesProduceSeqCheckStepSer
             return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog().scanInfo(workOrderNoList2Jump.toString()), stepResult, String.format("加工单%s跳过顺序防错验证成功!", workOrderNoList2Jump.toString()));
 
         //验证是否已经全部通过
-        if (!isExistNeedCheckProduceSeq(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "加工单均已通过顺序防错验证!");
+        if (!isExistNeedCheckProductSeq(productionPartContextList)) return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "加工单均已通过顺序防错验证!");
 
         //顺序防错验证处理
-        doHandleProduceSeqCheck(reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList);
+        doHandleProductSeqCheck(reqBean, resultBean, stepResult, productionProcessContext, productionPartContextList);
 
         return stepResult;
 
     }
 
     //顺序防错验证处理
-    private void doHandleProduceSeqCheck(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, List<MesProductionPartContext> productionPartContextList) {
+    private void doHandleProductSeqCheck(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, List<MesProductionPartContext> productionPartContextList) {
 
         List<String> workOrderNoList = new ArrayList<>();
 
@@ -95,7 +95,7 @@ public class MesProduceSeqCheckSortStepService extends MesProduceSeqCheckStepSer
             if (null == productionPartContext || StringUtils.isEmpty(productionPartContext.getWorkOrderNo()) || productionPartContext.getCheckSeqResult().compareTo(MesPcnExtConstWords.ZERO) != 0) continue;
 
             //顺序防错验证
-            Boolean result = doProduceSeqCheckSort(reqBean, stepResult, productionProcessContext, productionPartContext);
+            Boolean result = doProductSeqCheckSort(reqBean, stepResult, productionProcessContext, productionPartContext);
 
             productionPartContext.checkSeqResult(!result ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
 
@@ -112,18 +112,18 @@ public class MesProduceSeqCheckSortStepService extends MesProduceSeqCheckStepSer
     }
 
     //前道工艺防错验证 【排序】
-    private Boolean doProduceSeqCheckSort(StationRequestBean reqBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesProductionPartContext productionPartContext) {
+    private Boolean doProductSeqCheckSort(StationRequestBean reqBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesProductionPartContext productionPartContext) {
 
         String message = StringUtils.isEmpty(stepResult.getMsg()) ? MesPcnExtConstWords.EMPTY : stepResult.getMsg() + MesPcnExtConstWords.SEMICOLON;
 
         //根据生产工单顺序号,生产线代码,零件生产组代码查询上一个生产工单信息
-        MesWorkOrder workOrder = workOrderExtService.getWorkOrder(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), productionPartContext.getProduceSeq(), productionPartContext.getPartProdGroupCode());
+        MesWorkOrder workOrder = workOrderExtService.getWorkOrder(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), productionPartContext.getProductSeq(), productionPartContext.getPartProdGroupCode());
 
         if (null == workOrder) return true;
 
         if (workOrder.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue()) < 0)
             return stepResult.isCompleted(false).msg(String.format("%s加工单[%s]生产顺序号[%s]顺序防错验证失败,前一个加工单[%s]生产顺序号[%s]工单状态[%s]",
-                    message, productionPartContext.getWorkOrderNo(), productionPartContext.getProduceSeq(), workOrder.getWorkOrderNo(), workOrder.getProduceSeq(), MesExtEnumUtil.ORDER_STATUS.valueOfDescription(workOrder.getWorkOrderStatus()))).isCompleted();
+                    message, productionPartContext.getWorkOrderNo(), productionPartContext.getProductSeq(), workOrder.getWorkOrderNo(), workOrder.getProductSeq(), MesExtEnumUtil.ORDER_STATUS.valueOfDescription(workOrder.getWorkOrderStatus()))).isCompleted();
 
         if (workOrder.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()) >= 0) return true;
 
@@ -139,7 +139,7 @@ public class MesProduceSeqCheckSortStepService extends MesProduceSeqCheckStepSer
         if (CollectionUtils.isEmpty(productSnMap)) return true;
 
         return stepResult.isCompleted(false).msg(String.format("%s加工单[%s]生产顺序号[%s]顺序防错验证失败,前一个加工单[%s]生产顺序号[%s]在当前工位存在未完成队列条码%s",
-                message, productionPartContext.getWorkOrderNo(), productionPartContext.getProduceSeq(), workOrder.getWorkOrderNo(), workOrder.getProduceSeq(), productSnMap.keySet().toString())).isCompleted();
+                message, productionPartContext.getWorkOrderNo(), productionPartContext.getProductSeq(), workOrder.getWorkOrderNo(), workOrder.getProductSeq(), productSnMap.keySet().toString())).isCompleted();
 
     }
 

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

@@ -25,8 +25,8 @@ import java.util.Optional;
  * @Author : wangjie
  **/
 @Slf4j
-@Service("mesProduceSeqCheckStepService")
+@Service("mesProductSeqCheckStepService")
-public class MesProduceSeqCheckStepService extends BaseStepService {
+public class MesProductSeqCheckStepService extends BaseStepService {
 
     @Autowired
     public IMesProductionProcessContextStepService productionProcessContextStepService;
@@ -38,10 +38,10 @@ public class MesProduceSeqCheckStepService extends BaseStepService {
     public StepResult execute(StationRequestBean reqBean) {
 
         //排序线 生产工单顺序防错工步
-        if (MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == productionProcessContextStepService.getCenterType(reqBean)) return ((IStepService) SpringContextsUtil.getBean("mesProduceSeqCheckSortStepService")).executeInState(reqBean);
+        if (MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == productionProcessContextStepService.getCenterType(reqBean)) return ((IStepService) SpringContextsUtil.getBean("mesProductSeqCheckSortStepService")).executeInState(reqBean);
 
         //非排序线 生产工单顺序防错工步
-        return ((IStepService) SpringContextsUtil.getBean("mesProduceSeqCheckNosortStepService")).executeInState(reqBean);
+        return ((IStepService) SpringContextsUtil.getBean("mesProductSeqCheckNosortStepService")).executeInState(reqBean);
 
     }
 
@@ -57,14 +57,14 @@ public class MesProduceSeqCheckStepService extends BaseStepService {
     }
 
     //验证工位是否设置需要前道防错
-    public Boolean isNeedCheckProduceSeq(List<MesProductionPartContext> productionPartContextList) {
+    public Boolean isNeedCheckProductSeq(List<MesProductionPartContext> productionPartContextList) {
         Optional<MesProductionPartContext> optional = productionPartContextList.stream().filter(o -> (null != o &&
                 o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0 && o.getIsCheckSeq().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) == 0)).findFirst();
         return (null == optional || !optional.isPresent()) ? false : true;
     }
 
     //验证是否已经全部通过
-    public Boolean isExistNeedCheckProduceSeq(List<MesProductionPartContext> productionPartContextList) {
+    public Boolean isExistNeedCheckProductSeq(List<MesProductionPartContext> productionPartContextList) {
         Optional<MesProductionPartContext> optional = productionPartContextList.stream().filter(o -> (null != o &&
                 o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0 && o.getCheckSeqResult().compareTo(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) != 0)).findFirst();
         return (null == optional || !optional.isPresent()) ? false : true;

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionPartContext.java

@@ -90,7 +90,7 @@ public class MesProductionPartContext implements Serializable {
     private Integer messageSource;
 
     @ApiParam("生产序号")
-    private Long produceSeq;
+    private Long productSeq;
 
     @ApiParam("客户订单号")
     private String custOrderNo;

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesQueueOrderModel.java

@@ -51,7 +51,7 @@ public class MesQueueOrderModel implements Serializable {
     private String partProdGroupName;
 
     @ApiParam("生产序号")
-    private Long produceSeq;
+    private Long productSeq;
 
     @ApiParam("工单序号")
     private String workOrderSeq;

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -208,7 +208,7 @@ public class MesPcnExtConstWords {
     // 工步代码
     public static final String STEP_CODE = "stepCode";
     // 生产顺序号
-    public static final String PRODUCE_SEQ = "produceSeq";
+    public static final String PRODUCT_SEQ = "productSeq";
     // URL
     public static final String URL = "url";
     // 处理状态