44632 零件发运组 明细不需要校验是否为空 merge解决 之前改的装箱防错的冲突，还有ConstWords的冲突

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

@@ -132,7 +132,6 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer
                     qty = getQty(packingDefine, split);
                 }
                 mesPackage = mesPackageRDao.insert(getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode));
-                mesPackage.setIsPackage(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             }
             mesPackage.setIsPackage(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
             return ResultBean.success("箱条码扫描成功,请扫零件条码!").setResultObject(mesPackage);

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

@@ -206,6 +206,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }else{
             //自制件校验前道工艺 零件发运组详情中的优先
             MesPartShippingGroupDetail groupDetail = mesPartShippingGroupService.getMesPartShippingGroupDetailByPartNo(organizeCode, shippingGroup.getShippingGroupCode(), produceSn.getPartNo());
+            if (null == groupDetail) return true;
             if (!StringUtils.isEmpty(groupDetail.getFrontProcessCode())){
                 Integer count = mesProductionRecordService.findFrontProcessProductionRecord(organizeCode, produceSn.getProductSn(), groupDetail.getFrontProcessCode());
                 if (count > 0){

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

@@ -306,6 +306,7 @@ public class MesPcnExtConstWords {
     public static final String EFF_END_TIME = "effEndTime";
     //MES汇报查询BOM是否携带结束查询条件
     public static final String MES_REPORT_FIND_BOM_WITH_EFFENDTIME = "MES_REPORT_FIND_BOM_WITH_EFFENDTIME";
+
     //返工单
     public static final String REWORK_ORDER = "reworkOrder";
     //返工单ID