Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java

@@ -59,7 +59,6 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean);
-        DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean);
         DdlPreparedPack.getIsNull("endTime", packBean);
 
         boolean flg = mesProdShiftRecordRDao.isExitByHql(packBean);
@@ -67,8 +66,8 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("开关班记录产线【%s】班组代码【%s】班次代码【%s】已经存在，请检查数据",
-                            item.getWorkCenterCode(),item.getShiftGroup(),item.getShiftCode())
+                    .setErrorDetail("开关班记录产线【%s】班组代码【%s】已经存在，请检查数据",
+                            item.getWorkCenterCode(),item.getShiftGroup())
                     .build();
         }
         ConvertBean.serviceModelInitialize(item, AuthUtil.getSessionUser().getUserName());

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

@@ -409,7 +409,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         shippingOrderManagementDetailRepository.saveAll(orderManagementDetailList);
         //1.更新装车单明细对应的发运单状态=发运
         DdlPackBean vehiclesOrderDetailPackBean = DdlPackBean.getDdlPackBean(org);
-        DdlPreparedPack.getNumEqualPack(orderManagement.getShippingCode(), "shippingCode", vehiclesOrderDetailPackBean);
+        DdlPreparedPack.getStringEqualPack(orderManagement.getShippingCode(), "shippingCode", vehiclesOrderDetailPackBean);
         MesLoadingListDetail vehiclesOrderDetail = vehiclesOrderDetailRepository.getByProperty(vehiclesOrderDetailPackBean);
         if(!StringUtil.isEmpty(vehiclesOrderDetail)){
             vehiclesOrderDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
@@ -419,7 +419,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
         DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderManagementPackBean);
-        DdlPreparedPack.getNotInPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "shippingCode", orderManagementPackBean);
+        DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean);
         boolean exitByHql = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean);
         //2.装车单中所有发运单全部变成发运回传
         if(!exitByHql){

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

@@ -186,7 +186,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         Map<Long, List<MesEquipmentLog>> realMap = null;
         //获取实际值值设备数据
         List<MesEquipmentLog> realEquipmentLogList = new ArrayList<>();
-        if(!Objects.isNull(mesEquipment) && StringUtils.isEmpty(mesEquipment.getEquipId())){
+        if(!Objects.isNull(mesEquipment) && !StringUtils.isEmpty(mesEquipment.getEquipId())){
             //获取设定值设备变量ID
             List<Long> setEquipVariableIdList =
                     model.getOrderResultList().stream().filter(k -> k.getSpotCheckItemType() == MesExtEnumUtil.SPOT_CHECK_ITEM_TYPE.AUTO.getValue()).map(MesSpotCheckOrderResult::getSetEquipVariableId).collect(Collectors.toList());