所有页面零件信息查询支持模糊匹配

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/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/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

@@ -32,7 +32,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

@@ -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);