成都发运代码提交

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

@@ -157,7 +157,6 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         }else{
             //校验发运单是否存在
             checkLoadingList(model, organizeCode, loadingList);
-//            checkdddLoadingList(model, organizeCode, loadingList);
             //查询零件发运组
             MesPartShippingGroup shippingGroup = getMesPartShippingGroup(organizeCode, loadingList.getPartShippingGroupCode());
             boolean scanflg = false;
@@ -253,13 +252,6 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         }
     }
 
-    private void checkdddLoadingList(MesShippingLoadingCheckModel model, String organizeCode, MesLoadingList loadingList) {
-        DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getNumEqualPack(loadingList.getId(), "pid", orderDetailPackBean);
-        List<MesLoadingListDetail> vehiclesOrderDetails = vehiclesOrderDetailRepository.findByHqlWhere(orderDetailPackBean);
-        model.setDetailList(vehiclesOrderDetails);
-    }
-
     private void updateLoadingListDetail(MesShippingLoadingCheckModel model, String userInfo, MesLoadingList loadingList, MesLoadingListDetail loadingListDetail, String tempStatusVal, Integer status,String userName) {
         if(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue() == status){
             loadingListDetail.setScanSn(model.getShippingCode());

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

@@ -117,6 +117,12 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     private IMesProduceSnExtService mesProduceSnExtService;
 
     @Autowired
+    private MesShippingQueueRepository shippingQueueRDao;
+
+    @Autowired
+    private IMesConfigService mesConfigService;
+
+    @Autowired
     private MesVolvoRackRepository mesVolvoRackRDao;
     @Autowired
     private MesCustSoftInfoRepository custSoftInfoRDao;
@@ -141,7 +147,6 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }
         //发运单号
         model.setShippingCode(orderManagement.getShippingCode());
-        model.setVolvoRackNo(orderManagement.getRackNo());
         //零件发运组
         model.setMesPartShippingGroup(getMesPartShippingGroup(orderManagement.getOrganizeCode(),orderManagement.getShippingGroupCode()));
         //发运单明细
@@ -222,7 +227,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }else{
             //自制件校验前道工艺 零件发运组详情中的优先
             MesPartShippingGroupDetail groupDetail = mesPartShippingGroupService.getMesPartShippingGroupDetailByPartNo(organizeCode, shippingGroup.getShippingGroupCode(), produceSn.getPartNo());
-            if (null == groupDetail) return true;
+            if (null == groupDetail) {
+                return true;
+            }
             if (!StringUtils.isEmpty(groupDetail.getFrontProcessCode())){
                 Integer count = mesProductionRecordService.findFrontProcessProductionRecord(organizeCode, produceSn.getProductSn(), groupDetail.getFrontProcessCode());
                 if (count > 0){
@@ -248,6 +255,40 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         MesProduceSn produceSn = checkMesProduceSn(model, organizeCode);
         //校验发运单是否存在
         MesShippingOrderManagement orderManagement = checkMesShippingOrderManagement(model);
+        final String confirmPartType = getConfirmPartType(orderManagement);
+        if (Objects.equals(confirmPartType, String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_50.getValue()))) {
+            return saveChengDuSnAndLocationCode(model, organizeCode, userInfo);
+        }
+        //根据条码找到对应的物料号，若物料号一致，则修改扫描flg，将flg改为true.
+        boolean scanFlg = false;
+        for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
+            if (detail.getPartNo().equals(produceSn.getPartNo())) {
+                scanFlg = true;
+                detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
+                detail.setBarcode(produceSn.getSerialNumber());
+                break;
+            }
+        }
+
+        if (!scanFlg) {
+            throw new ImppBusiException(String.format("【%s】此条码对应的【%s】物料号与发运单中物料号不匹配，请检查数据！", model.getSn(), produceSn.getPartNo()));
+        }
+
+        Long count = model.getDetailList().stream().filter(k -> Objects.equals(k.getIsScanFlg(), MesCommonConstant.TRUE_INTEGER)).count();
+
+        //当前发运单全部扫描完成
+        if (count.intValue() == model.getDetailList().size()) {
+            //保存数据库
+            saveDate(orderManagement, model, organizeCode, userInfo);
+        }
+        return model;
+    }
+
+    private MesSortShippingCheckModel saveChengDuSnAndLocationCode(MesSortShippingCheckModel model, String organizeCode, String userInfo) {
+        //校验条码
+        MesProduceSn produceSn = checkMesProduceSn(model, organizeCode);
+        //校验发运单是否存在
+        MesShippingOrderManagement orderManagement = checkMesShippingOrderManagement(model);
         //根据条码找到对应的物料号，若物料号一致，则修改扫描flg，将flg改为true.
         boolean scanFlg = false;
         for (MesShippingOrderManagementDetail detail : model.getDetailList()) {
@@ -281,6 +322,8 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 shippingOrderManagementDetailRepository.update(detail);
                 break;
             }
+
+            final String confirmPartType = getConfirmPartType(orderManagement);
         }
 
         if (!scanFlg) {
@@ -425,10 +468,22 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     }
 
     private List<MesShippingOrderManagementDetail> getMesShippingOrderManagementDetails(MesShippingOrderManagement orderManagement,MesPartShippingGroup mesPartShippingGroup) {
+        //45550 PDA-MES-PDA发运扫描排序方式修改
+        List<MesConfig> shippingBusiSoftCfgList = mesConfigService.getConfigList(orderManagement.getOrganizeCode(),
+                MesCommonConstant.SHIPPING_BUSI_SOFT_CFG, mesPartShippingGroup.getShippingGroupCode(), null);
         DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(orderManagement.getOrganizeCode());
         DdlPreparedPack.getNumEqualPack(orderManagement.getId(), "pid", orderDetailPackBean);
         DdlPreparedPack.getNumberSmallerPack(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.CLOSE.getValue(),"status",orderDetailPackBean);
+        if (CollectionUtils.isEmpty(shippingBusiSoftCfgList)) {
             DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"custInfoSeq"}, orderDetailPackBean);
+        }else {
+            MesConfig mesConfig = shippingBusiSoftCfgList.get(0);
+            if (!Objects.isNull(mesConfig) &&
+                    !StringUtils.isEmpty(mesConfig.getCfgValue()) &&
+                    "logic_seq".equals(mesConfig.getCfgValue())) {
+                DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"logicSeq"}, orderDetailPackBean);
+            }
+        }
         List<MesShippingOrderManagementDetail> detailList = shippingOrderManagementDetailRepository.findByHqlWhere(orderDetailPackBean);
         if(CollectionUtils.isEmpty(detailList)){
             throw new ImppBusiException(String.format("发运单【%s】明细信息不存在，请检查数据！", orderManagement.getShippingCode()));
@@ -538,10 +593,10 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
     private void checkStatus(MesSortShippingCheckModel model, MesProduceSn produceSn) {
         //校验产品条码状态 必须是状态为已下线条码
-//        if (produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue() && produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()) {
+        if (produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue() && produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue()) {
-//            throw new ImppBusiException(String.format("【%s】此条码状态为【%s】,请选择状态为【%s】或【%s】状态的条码，请检查数据！", model.getSn(), MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(produceSn.getSnStatus()),
+            throw new ImppBusiException(String.format("【%s】此条码状态为【%s】,请选择状态为【%s】或【%s】状态的条码，请检查数据！", model.getSn(), MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(produceSn.getSnStatus()),
-//                    MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getDescription(),MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getDescription()));
+                    MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getDescription(),MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getDescription()));
-//        }
+        }
         //校验产品质量状态 必须是状态为合格条码
         if (produceSn.getQcStatus() != MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()) {
             throw new ImppBusiException(String.format("【%s】此条码质量状态为【%s】,请选择【%s】状态的条码，请检查数据！", model.getSn(), MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(produceSn.getQcStatus()),
@@ -612,6 +667,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         //查询条码信息
         Map<String, List<MesProduceSn>> produceSnByCustSnMap = getProduceSnByCustSnMap(orderManagement.getIsEnableMemory(), organizeCode, detailList.stream().map(MesShippingOrderManagementDetail::getBarcode).filter(barCode -> !StringUtil.isEmptyAndNull(barCode)).collect(Collectors.toList()));
 
+        final String confirmPartType = getConfirmPartType(orderManagement);
         List<MesProduceSn> produceSnList = new ArrayList<>();
         List<String> workOrderNoList = new ArrayList<>();
         List<MesShippingSnUnique> mesShippingSnUniqueList = new ArrayList<>();
@@ -640,9 +696,16 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     workOrderNoList.add(detail.getVisualOrderNo());
                     //更新应急件库位管理库存出库
                     mesEmergencyLocationService.doShippingStockOutOnline(organizeCode, detail.getVisualOrderNo(), userInfo, true);
-                    //条码格式(扫描目视单,扫描条码)
+                    // 保存到发运队列，后续发运单的条码会拼接，而保存到发运队列中的为拼接前的数据，因此要在拼接前调用。
-//                    detail.setBarcode(new StringJoiner(MesPcnExtConstWords.COMMA).add(detail.getVisualOrderNo()).add(detail.getBarcode()).toString());
+                    saveShippingQueue(orderManagement, detail, userInfo);
+                    if (!Objects.equals(confirmPartType, String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_40.getValue()))) {
+                        if (Objects.equals(confirmPartType, String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_50.getValue()))) {
                             detail.setBarcode(detail.getBarcode() + "," + detail.getPartPosition());
+                        } else {
+                            //条码格式(扫描目视单,扫描条码)
+                            detail.setBarcode(new StringJoiner(MesPcnExtConstWords.COMMA).add(detail.getVisualOrderNo()).add(detail.getBarcode()).toString());
+                        }
+                    }
                 }
             }
             //客供品移库
@@ -685,7 +748,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             DdlPreparedPack.getNumEqualPack(orderManagement.getLoadingListId(),"pid",orderManagementPackBean);
             DdlPreparedPack.getNumberSmallerEqualPack(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SKIP.getValue(),"status",orderManagementPackBean);
             List<MesLoadingListDetail> listDetails = vehiclesOrderDetailRepository.findByHqlWhere(orderManagementPackBean);
-            if(CollectionUtils.isEmpty(listDetails)) return;
+            if(CollectionUtils.isEmpty(listDetails)) {
+                return;
+            }
 
             List<String> shippingCodeList = listDetails.stream().map(MesLoadingListDetail::getShippingCode).collect(Collectors.toList());
             orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode);
@@ -759,6 +824,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         return rule;
     }
 
+    @Override
     public List<MesJisShipping> getMesJisShippings(MesShippingOrderManagement mesShippingOrderManagement,List<MesShippingOrderManagementDetail> shippingOrderManagementDetails,String userName) {
         if (CollectionUtils.isEmpty(shippingOrderManagementDetails)) {
             DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(mesShippingOrderManagement.getOrganizeCode());
@@ -783,7 +849,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
     }
 
     private void updateShippingOrderDetails(String organizeCode, String userName, long id) {
-        if(StringUtils.isEmpty(id) || StringUtils.isEmpty(organizeCode)) return;
+        if(StringUtils.isEmpty(id) || StringUtils.isEmpty(organizeCode)) {
+            return;
+        }
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getNumEqualPack(id, "pid",packBean);
         shippingOrderManagementDetailRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "status","remark"},
@@ -835,4 +903,39 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             }
         }
     }
+
+    private void saveShippingQueue(MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo) {
+        if (StringUtil.isEmpty(detail.getVin())) {
+            MesPcnException.throwMesBusiException("发运单【%s】零件号【%s】vin号为空，请检查数据", orderManagement.getShippingCode(), detail.getPartNo());
+        }
+        final boolean matchCfgValue = mesConfigService.checkCfgValueIsContainItem(orderManagement.getOrganizeCode(), MesPcnExtConstWords.MES_SHIPPING_QUEUE_SAVE_CFG, null, null, ",", orderManagement.getShippingGroupCode());
+        if (!matchCfgValue) {
+            return;
+        }
+
+        MesShippingQueue mesShippingQueue = new MesShippingQueue();
+        mesShippingQueue.setOrganizeCode(orderManagement.getOrganizeCode());
+        mesShippingQueue.setShippingCode(orderManagement.getShippingCode());
+        mesShippingQueue.setShippingGroupCode(orderManagement.getShippingGroupCode());
+        mesShippingQueue.setShippingType(orderManagement.getShippingType());
+        mesShippingQueue.setWorkOrderNo(detail.getVisualOrderNo());
+        mesShippingQueue.setCustSn(detail.getBarcode());
+        mesShippingQueue.setPartNo(detail.getPartNo());
+        mesShippingQueue.setPartName(detail.getPartName());
+        mesShippingQueue.setVin(detail.getVin());
+        mesShippingQueue.setQueueStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
+        ConvertBean.serviceModelInitialize(mesShippingQueue, userInfo);
+        shippingQueueRDao.insert(mesShippingQueue);
+    }
+
+    private String getConfirmPartType(MesShippingOrderManagement orderManagement) {
+        if (StringUtils.isEmpty(orderManagement.getShippingGroupCode())) {
+            return "";
+        }
+        MesPartShippingGroup shippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(orderManagement.getOrganizeCode(), orderManagement.getShippingGroupCode());
+        if (shippingGroup == null) {
+            return "";
+        }
+        return shippingGroup.getConfirmPartType();
+    }
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/constant/MesCommonConstant.java

@@ -32,5 +32,7 @@ public class MesCommonConstant {
     //报工条码规则
     public static final String REPORT_SN = "REPORT_SN";
 
+    //PDA发运校验-排序字段参数配置
+    public static final String SHIPPING_BUSI_SOFT_CFG = "SHIPPING_BUSI_SOFT_CFG";
 
 }

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

@@ -85,6 +85,8 @@ public class MesPcnExtConstWords {
     // 零件名称
     public static final String PART_NAME = "partName";
     // 设备代码
+    public static final String EQUIP_CODE = "equipCode";
+    // 设备代码
     public static final String EQUIPMENT_CODE = "equipmentCode";
     // 设备名称
     public static final String EQUIPMENT_NAME = "equipmentName";
@@ -246,6 +248,8 @@ public class MesPcnExtConstWords {
     public static final String CUST_ORDER_NO = "custOrderNo";
     //包装条码
     public static final String PACKAGE_NO = "packageNo";
+    //包装一维码
+    public static final String PACKAGE_ONE_CODE = "packageOneCode";
     //包条码
     public static final String PACKAGE_SN = "packageSn";
     //包类型
@@ -323,6 +327,60 @@ public class MesPcnExtConstWords {
     public static final String UNIT = "unit";
     //包装规格数量
     public static final String PACK_SPEC_QTY = "packSpecQty";
+    //动态列名
+    public static final String ATTR_BEAN_LIST = "ATTR_BEAN_LIST";
+    //支持允许前端开窗选零件
+    public static final String IS_SELECT_PART = "IS_SELECT_PART";
+    //点检类型
+    public static final String SPOT_CHECK_ITEM_TYPE = "spotCheckItemType";
+    //点检项目ID
+    public static final String SPOT_CHECK_ID = "spotCheckId";
+    //设定值录入方式
+    public static final String SET_VALUE_RECORD_TYPE = "setValueRecordType";
+    //实际值录入方式
+    public static final String REAL_VALUE_RECORD_TYPE = "realValueRecordType";
+    //设定值数值
+    public static final String SPOT_CHECK_SET_VALUE = "spotCheckSetValue";
+    //实际值数值
+    public static final String SPOT_CHECK_REAL_VALUE = "spotCheckRealValue";
+    //是否超差
+    public static final String IS_TOLERANCE = "isTolerance";
+    //点检结果
+    public static final String SPOT_CHECK_RESULT = "spotCheckResult";
+    //点检单据结果
+    public static final String SPOT_CHECK_ORDER_RESULT = "spotCheckOrderResult";
+    //点检单据时间
+    public static final String SPOT_CHECK_TIME = "spotCheckTime";
+    //点检人
+    public static final String SPOT_CHECK_USER = "spotCheckUser";
+    //发运组代码
+    public static final String SHIPPING_GROUP_CODE = "shippingGroupCode";
+    //发运单代码
+    public static final String SHIPPING_CODE = "shippingCode";
+    //最后打印时间
+    public static final String LAST_PRINT_TIME = "lastPrintTime";
+    //发运组名称
+    public static final String SHIPPING_GROUP_NAME = "shippingGroupName";
+    //队列状态
+    public static final String QUEUE_STATUS = "queueStatus";
+    //目标工位
+    public static final String TARGET_WORK_CELL_CODE = "targetWorkCellCode";
+    //工艺顺序号
+    public static final String PROCESS_SEQ = "processSeq";
+    //工艺顺序号(上面)
+    public static final String PROCESS_SEQ_UP = "processSeqUp";
+    //工艺顺序号(下面)
+    public static final String PROCESS_SEQ_DOWN = "processSeqDown";
+    //推送来源代码
+    public static final String PUSH_SOURCE_CODE = "pushSourceCode";
+    //业务类型
+    public static final String BUSI_TYPE = "busiType";
+    //当前页数
+    public static final String CURRENT_PAGE = "currentPage";
+    //页面数量
+    public static final String PAGE_SIZE = "pageSize";
+    //枚举代码
+    public static final String ENUM_CODE = "enumCode";
 
 
     //BaseBean字段不包含工厂, 用于对象复制剔除属性BeanUtils.copyProperties(Object source, Object target, String... ignoreProperties)
@@ -409,6 +467,12 @@ public class MesPcnExtConstWords {
     public static final String CONTEXT_UNBINDING_STEP = "CONTEXT_UNBINDING_STEP";
     // 零件条码统计OEE共享信息[工步参数]
     public static final String BARCODE_COUNT_SHARE_INFO = "BARCODE_COUNT_SHARE_INFO";
+    //替换起始位置[工步参数]
+    public static final String REPLACE_INDEX = "replaceIndex";
+    //替换长度[工步参数]
+    public static final String REPLACE_LENGTH = "replaceLength";
+    //替换信息[工步参数]
+    public static final String REPLACE_INFO = "replaceInfo";
 
     // 装配件显示规则配置[工位参数]
     public static final String ASSEMBLY_SHOW_MR_CFG = "ASSEMBLY_SHOW_MR_CFG";
@@ -430,6 +494,8 @@ public class MesPcnExtConstWords {
     public static final String ENDLESS_LOOP_READ_TIMES_DEFAULT = "10";
     // 所有分屏强制跳过工序密码[工位参数]
     public static final String MANY_CELL_TRIGGER_JUMP_PROCESS_PWD = "MANY_CELL_TRIGGER_JUMP_PROCESS_PWD";
+    // 非排序顺序防错级别配置[工位参数] 1=物料 否则=生产线
+    public static final String CHECK_PRODUCT_SEQ_CFG = "CHECK_PRODUCT_SEQ_CFG";
 
     // 工位/工步 参数按钮事件
     public static final String FUNCTION_CMD = "FUNCTION_CMD";
@@ -450,6 +516,8 @@ public class MesPcnExtConstWords {
     public static final String FUNCTION_CHOOSE_CAVITY_ORDER = "FUNCTION_CHOOSE_CAVITY_ORDER";
     // 工位参数按钮事件: 选择产成零件(先选腔数, 再选零件)
     public static final String FUNCTION_CHOOSE_CAVITY_PART = "FUNCTION_CHOOSE_CAVITY_PART";
+    // 工位参数按钮事件: 选择发运组
+    public static final String FUNCTION_CHOOSE_SHIPPING_GROUP = "FUNCTION_CHOOSE_SHIPPING_GROUP";
     // 工位参数按钮事件: 切换工位
     public static final String FUNCTION_SWITCH_CELL = "FUNCTION_SWITCH_CELL";
     // 工位参数按钮事件: 锁定
@@ -476,8 +544,14 @@ public class MesPcnExtConstWords {
     public static final Integer FOUR = 4;
     //7
     public static final Integer SEVEN = 7;
+    //10
+    public static final Integer TEN = 10;
     //14
     public static final Integer FOURTEEN = 14;
+    //49
+    public static final Integer FORTY_NINE = 49;
+    //50
+    public static final Integer FIFTY = 50;
     //60
     public static final Integer SIXTY = 60;
     //100
@@ -578,6 +652,16 @@ public class MesPcnExtConstWords {
     public static final String PACKAGE_DATA_CONTEXT = "PACKAGE_DATA_CONTEXT";
     // 打包规则上下文
     public static final String PACKAGE_RULE_CONTEXT = "PACKAGE_RULE_CONTEXT";
+    // 设备点检上下文
+    public static final String EQUIP_SPOT_CHECK_CONTEXT = "EQUIP_SPOT_CHECK_CONTEXT";
+    // 加工不可用规则上下文
+    public static final String PROD_RULE_IGNORE_CFG_CONTEXT = "PROD_RULE_IGNORE_CFG_CONTEXT";
+    // 推送队列配置上下文
+    public static final String QUEUE_PUSH_CFG_CONTEXT = "QUEUE_PUSH_CFG_CONTEXT";
+    // 推送队列锁上下文
+    public static final String QUEUE_PUSH_LOCK_CONTEXT = "QUEUE_PUSH_LOCK_CONTEXT";
+    // 推送队列上下文
+    public static final String QUEUE_PUSH_CONTEXT = "QUEUE_PUSH_CONTEXT";
 
     // 上下文: 展示组件数据
     public static final String MODULE_CONTENT_CONTEXT = "MODULE_CONTENT_CONTEXT";
@@ -621,6 +705,8 @@ public class MesPcnExtConstWords {
     public static final String WORK_ORDER_CUT_FG_DATA_CONTEXT = "WORK_ORDER_CUT_FG_DATA_CONTEXT";
     // 上下文: 临时数据
     public static final String PROD_TEMP_DATA_CONTEXT = "PROD_TEMP_DATA_CONTEXT";
+    // 上下文: 发运队列
+    public static final String SHIPPING_QUEUE_CONTEXT = "SHIPPING_QUEUE_CONTEXT";
 
 
     //OPC_API_PARAM
@@ -745,6 +831,10 @@ public class MesPcnExtConstWords {
     public static final String FG_PART_NO = "fgPartNo";
     // 打印日期
     public static final String PRINT_DATE = "printDate";
+    // 生产日期
+    public static final String PRODUCT_DATE = "productDate";
+    // 生产日期
+    public static final String PRODUCT_TIME = "productTime";
     // 打印时间
     public static final String PRINT_TIME = "printTime";
     //替换数
@@ -763,6 +853,8 @@ public class MesPcnExtConstWords {
 
     // 车型名称
     public static final String CAR_MODEL_NAME = "carModelName";
+    // VIN
+    public static final String VIN = "vin";
     // VIN_CODE
     public static final String VIN_CODE = "vinCode";
     // VIN_CODE 后四位
@@ -806,4 +898,11 @@ public class MesPcnExtConstWords {
     //螺钉包保存生产版本标记
     public static final String SAVE_PRODUCT_VERSION_FLAG = "ZFBT";
 
+    //发运组配置后写入mes_shipping_queue
+    public static final String MES_SHIPPING_QUEUE_SAVE_CFG = "MES_SHIPPING_QUEUE_SAVE_CFG";
+
+    //SPS拉动单打印模版全局配置
+    public static final String PART_PULL_PRINT_TEMPLATE = "PART_PULL_PRINT_TEMPLATE";
+    //排序发运全局打印配置
+    public static final String SORT_SHIPPING_PRINT_TEMPLATE = "SORT_SHIPPING_PRINT_TEMPLATE";
 }