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

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesOrgService.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesOrg;
+
+/**
+ * @Description: 责任人区域关系
+ * @Author: gsz
+ * @Date: 2024/5/25 18:16
+ * @Modify:
+ */
+public interface IMesOrgService extends IBaseMesService<MesOrg> {
+
+
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesOrgController.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesOrg;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description: 责任人区域关系
+ * @Author: gsz
+ * @Date: 2024/5/25 18:16
+ * @Modify:
+ */
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesOrg")
+public class MesOrgController extends BaseMesController<MesOrg>{
+}

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

@@ -59,7 +59,7 @@ public class MesCarSeriesLoosePartService extends BaseMesService<MesCarSeriesLoo
 
 
     protected void setPackQueryBean(MesCarSeriesLoosePart bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(),"partNo",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustCode(),"custCode",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCarSeriesCode(),"carSeriesCode",packBean);
     }

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

@@ -14,6 +14,6 @@ public class MesCcscRuleServiceImpl extends BaseMesService<MesCcscRule> implemen
 
     @Override
     protected void setPackQueryBean(MesCcscRule bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
     }
 }

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

@@ -41,7 +41,7 @@ public class MesCcscTaskServiceImpl extends BaseMesService<MesCcscTask> implemen
 
     @Override
     protected void setPackQueryBean(MesCcscTask bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getTaskNo(), "taskNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkOrderNo(), "workOrderNo", packBean);
     }

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

@@ -72,7 +72,7 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
     @Override
     public List<MesCustomerCarModel> findMesCustomerCarModel(MesCustomerCarModelDetail mesPartProdGroupDetail) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean);
         List<MesCustomerCarModelDetail> mesCustomerCarModelDetails = mesCustomerCarModelDetailRDao.findByHqlWhere(ddlPackBean);
         if(CollectionUtils.isEmpty(mesCustomerCarModelDetails)){
             return new ArrayList<>();

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

@@ -88,7 +88,7 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
     @Override
     public List<MesCustomerPart> findMesCustomerPart(MesCustomerCarModelDetail mesPartProdGroupDetail) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(), "partNo", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(mesPartProdGroupDetail.getPartNo(), "partNo", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getCarModelCode(), "carModelCode", ddlPackBean);
         List<MesCustomerCarModelDetail> mesCustomerCarModelDetails = mesCustomerCarModelDetailRDao.findByHqlWhere(ddlPackBean);
         if (CollectionUtils.isEmpty(mesCustomerCarModelDetails)) {

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

@@ -98,7 +98,7 @@ public class MesDefectWarnConfigService extends BaseMesService<MesDefectWarnConf
         DdlPreparedPack.getStringEqualPack(bean.getDefectTypeCode(), "defectTypeCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getDefectLocation(), "defectLocation", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPartTypeCode(), "partTypeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
     }
 
     @Override

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

@@ -5,22 +5,38 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
-import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg;
+import cn.estsh.i3plus.pojo.mes.repository.MesWcEquipmentRepository;
-import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @Slf4j
 public class MesEquipmentService extends BaseMesService<MesEquipment> implements IMesEquitmentService {
 
+    @Autowired
+    private MesWcEquipmentRepository mesWcEquipmentRepository;
+
     @Override
     protected void setPackQueryBean(MesEquipment bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean);
+        if (!StringUtil.isEmpty(bean.getFilterWorkCell())) {
-        DdlPreparedPack.getStringEqualPack(bean.getEquipmentName(),"equipmentName",packBean);
+            //过滤已绑定工位
+            DdlPackBean packBean1 = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+            DdlPreparedPack.getIsNotNull("equipmentCode", packBean1);
+            DdlPreparedPack.getIsNotNull( "workCellCode", packBean1);
+
+            List<MesWcEquipment> workCells = mesWcEquipmentRepository.findByHqlWhere(packBean1);
+            DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode), "equipmentCode", packBean);
+        }
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentName(), "equipmentName", packBean);
     }
 
 
@@ -29,7 +45,7 @@ public class MesEquipmentService extends BaseMesService<MesEquipment> implements
         //插入前构造并校验数据
         onInsertBean(bean);
         Integer equipId = 1;
-        DdlPackBean packBean =  DdlPackBean.getDdlPackBean();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         packBean.setOrderByStr(" order by equipId desc");
         MesEquipment mesEquipment = baseRDao.getByProperty(packBean);
         if (mesEquipment != null && mesEquipment.getEquipId() != null) {

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

@@ -14,7 +14,7 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
 
     protected void setPackQueryBean(MesEquipmentSpotCheckPart bean, DdlPackBean packBean) {
         DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
     }
 
 }

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

@@ -55,7 +55,7 @@ public class MesItemPartErrorPreventionService extends BaseMesService<MesItemPar
 
     protected void setPackQueryBean(MesItemPartErrorPrevention bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getBarrelBarcode(), "barrelBarcode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getLot(), "lot", packBean);
     }

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

@@ -8,4 +8,34 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 public class MesLocationConfigService extends BaseMesService<MesLocationConfig> implements IMesLocationConfigService {
+
+
+    @Override
+    public MesLocationConfig insert(MesLocationConfig bean) {
+        //插入前构造并校验数据
+        onInsertBean(bean);
+        // 检查字符串长度是否为2
+        if (bean.getDefectLocation().length() == 2) {
+            bean.setDefectLocation(bean.getDefectLocation().charAt(0) + "0" + bean.getDefectLocation().charAt(1));
+        }
+
+        bean = baseRDao.insert(bean);
+        return bean;
+    }
+    protected void onInsertBean(MesLocationConfig item) {
+      // 数据校验
+      /*  ValidatorBean.checkNotNull(item.getDefectLocation(), "缺陷位置代码不能为空");
+
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getDefectLocation(), "defectLocation", seriesPackBean);
+        boolean flg = baseRDao.isExitByHql(seriesPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】设备代码已经存在，请检查数据", item.getDefectLocation())
+                    .build();
+        }*/
+    }
+
 }

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

@@ -19,7 +19,7 @@ public class MesMouldMultiCavityServiceImpl extends BaseMesService<MesMouldMulti
     @Override
     protected void setPackQueryBean(MesMouldMultiCavity bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getMouldNo(),"mouldNo",packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(),"partNo",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean);
     }
     @Override

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesOrgService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
+import cn.estsh.i3plus.pojo.mes.bean.MesOrg;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description:  责任人区域关系
+ * @Author: gsz
+ * @Date: 2024/5/27 19:10
+ * @Modify:
+ */
+@Service
+@Slf4j
+public class MesOrgServiceImpl extends BaseMesService<MesOrg> implements IMesOrgService {
+
+    @Override
+    protected void setPackQueryBean(MesOrg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getInventoryLocationCode(), "inventoryLocationCode", packBean);
+        if(StringUtil.isEmpty(bean.getResponsibleParty())){
+            DdlPreparedPack.getIsNotNull( "responsibleParty", packBean);
+        }else {
+            DdlPreparedPack.getStringEqualPack(bean.getResponsibleParty(), "responsibleParty", packBean);
+        }
+
+    }
+
+    @Override
+    protected void onInsertBean(MesOrg item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空");
+        ValidatorBean.checkNotNull(item.getInventoryLocationCode(), "inventoryLocationCode 不能为空");
+        ValidatorBean.checkNotNull(item.getResponsibleParty(), "responsibleParty 不能为空");
+
+        //唯一性校验
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getInventoryLocationCode(), "inventoryLocationCode", packBean);
+        DdlPreparedPack.getStringEqualPack(item.getResponsibleParty(), "responsibleParty", packBean);
+        boolean flg = baseRDao.isExitByHql(packBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("区域代码【%s】责任方【%s】已经存在，请检查数据",
+                            item.getInventoryLocationCode(), item.getResponsibleParty() )
+                    .build();
+        }
+    }
+
+
+}

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

@@ -24,7 +24,7 @@ public class MesPackingDefineDetailsServiceImpl extends BaseMesService<MesPackin
     @Override
     protected void setPackQueryBean(MesPackingDefineDetails bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getPackCode(), "packCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
     }
 

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

@@ -20,7 +20,7 @@ public class MesPartProdGroupDetailService extends BaseMesService<MesPartProdGro
 
     protected void setPackQueryBean(MesPartProdGroupDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), "custPartNo", packBean);
 

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

@@ -33,7 +33,7 @@ public class MesPartProdGroupService extends BaseMesService<MesPartProdGroup> im
 
     public List<MesPartProdGroup> findMesPartProdGroup(MesPartProdGroupDetail mesPartProdGroupDetail){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesPartProdGroupDetail.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(mesPartProdGroupDetail.getPartNo(),"partNo",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(mesPartProdGroupDetail.getWorkCenterCode(),"workCenterCode",ddlPackBean);
         List<MesPartProdGroupDetail> mesPartProdGroupDetails = mesPartProdGroupDetailRDao.findByHqlWhere(ddlPackBean);
         if(CollectionUtils.isEmpty(mesPartProdGroupDetails)){

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

@@ -18,7 +18,7 @@ public class MesPartSapService extends BaseMesService<MesPartSap> implements IMe
 
     @Override
     protected void setPackQueryBean(MesPartSap bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikeEqualPack(bean.getPartName(), "partName", packBean);
     }
 

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

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
 public class MesPartService extends BaseMesService<MesPart> implements IMesPartService {
 
     protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
 
     }

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

@@ -13,6 +13,6 @@ public class MesPartShippingGroupDetailService extends BaseMesService<MesPartShi
 
     protected void setPackQueryBean(MesPartShippingGroupDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupCode(), "shippingGroupCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
     }
 }

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

@@ -43,7 +43,7 @@ public class MesProdCraftRouteServiceImpl extends BaseMesService<MesProdCraftRou
         DdlPreparedPack.getNumEqualPack(bean.getCraftRouteType(), "craftRouteType", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPptCode(), "pptCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
     }
     @Override
     protected void onInsertBean(MesProdCraftRoute item) {

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

@@ -13,7 +13,7 @@ public class MesProductVersionService extends BaseMesService<MesProductVersion>
 
     @Override
     protected void setPackQueryBean(MesProductVersion bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(),"partNo",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(),"workCenterCode",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getProductVersion(),"productVersion",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShipInventoryPoint(),"shipInventoryPoint",packBean);

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

@@ -25,7 +25,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
 
     protected void setPackQueryBean(MesShippingOrderManagementDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustOrderNo(), "custOrderNo", packBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"custInfoSeq"}, packBean);
     }

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

@@ -83,7 +83,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.SORT.getValue()) {
             Long produceSeq = 0L;
             if (null != result && result.getProduceSeq() != null) {
-                produceSeq = result.getProduceSeq();
+                produceSeq = Math.toIntExact(result.getProduceSeq());
             }
 
             //生成工单号
@@ -92,7 +92,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
 
             MesWorkOrder copyMesWorkOrder = new MesWorkOrder();
             BeanUtils.copyProperties(bean, copyMesWorkOrder);
-            copyMesWorkOrder.setProduceSeq(produceSeq + 1);
+            copyMesWorkOrder.setProduceSeq((long) (produceSeq + 1));
             copyMesWorkOrder.setQty(1D);
             copyMesWorkOrder.setWorkOrderNo(resultList.get(0));
             ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser());
@@ -113,9 +113,9 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             genSerialNoModel = new GenSerialNoModel(MesCommonConstant.MES_WORK_ORDER_NO);
             Long produceSeq = 0L;
             if (null != result && result.getProduceSeq() != null) {
-                produceSeq = result.getProduceSeq();
+                produceSeq = Math.toIntExact(result.getProduceSeq());
             }
-            bean.setProduceSeq(produceSeq + 1);
+            bean.setProduceSeq((long) (produceSeq + 1));
             GenSerialNoModel orderSeqSerialNoModel = new GenSerialNoModel(MesCommonConstant.ORDER_NO_BTO_SEQ);
             List<String> resultList = syncFuncService.syncSerialNo(orderSeqSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
             bean.setWorkOrderSeq(resultList.get(0));
@@ -261,7 +261,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), "workOrderNo", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartNameRdd(), "partNameRdd", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "customerPartNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumEqualPack(bean.getWorkOrderStatus(), "workOrderStatus", packBean);