From c4e6e97320a1ed3e069515235b33f03d86cc83dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Thu, 30 May 2024 13:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0=E6=8D=AEbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/api/base/IMesAssemblyNosortCfgService.java       |  1 +
 .../base/MesEquipmentProdParamCfgServiceImpl.java            |  2 +-
 .../serviceimpl/base/MesProdRuleSortCfgService.java          | 12 ++++++------
 .../serviceimpl/base/MesTimeEfficientCfgService.java         |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java
index 87bafff..488683f 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesAssemblyNosortCfgService.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
+
 import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg;
 
 /**
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java
index 908206c..5f17c57 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentProdParamCfgServiceImpl.java
@@ -23,7 +23,7 @@ public class MesEquipmentProdParamCfgServiceImpl extends BaseMesService<MesEquip
     protected void setPackQueryBean(MesEquipmentProdParamCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"pid",packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPid(),"pid",packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSourceId(),"sourceId",packBean);
     }
 
     @Override
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java
index edd1e8e..b388449 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java
@@ -21,8 +21,8 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
 
     protected void setPackQueryBean(MesProdRuleSortCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getAssemblyPartNo(), "assemblyPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getAssemblyPartName(), "assemblyPartName", packBean);
 
     }
 
@@ -40,12 +40,12 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
         //ValidatorBean.checkNotNull(item.getInPartNo(), "进件零件号不能为空");
         ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
         ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空");
-        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getAssemblyPartNo(), "零件号不能为空");
 
         DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", seriesPackBean);
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", seriesPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getAssemblyPartNo(), "partNo", seriesPackBean);
 
 
         boolean flg = baseRDao.isExitByHql(seriesPackBean);
@@ -64,12 +64,12 @@ public class MesProdRuleSortCfgService extends BaseMesService<MesProdRuleSortCfg
         //ValidatorBean.checkNotNull(item.getInPartNo(), "进件零件号不能为空");
         ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
         ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空");
-        ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getAssemblyPartNo(), "零件号不能为空");
 
         DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", seriesPackBean);
         DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", seriesPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getAssemblyPartNo(), "partNo", seriesPackBean);
 
 
         boolean flg = baseRDao.isExitByHql(seriesPackBean);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesTimeEfficientCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesTimeEfficientCfgService.java
index f545a05..1766224 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesTimeEfficientCfgService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesTimeEfficientCfgService.java
@@ -13,6 +13,6 @@ public class MesTimeEfficientCfgService extends BaseMesService<MesTimeEfficientC
 
 
     protected void setPackQueryBean(MesTimeEfficientCfg bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getSourceId(), "sourceId", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSourceId(), "sourceId", packBean);
     }
 }