From 737efb5fcaf3e43123c64fcdf35a9fc05d8528dd Mon Sep 17 00:00:00 2001
From: gsz <fightgoo@qq.com>
Date: Thu, 19 Sep 2024 18:15:06 +0800
Subject: [PATCH] =?UTF-8?q?43155=20MES-PC:=E6=8B=89=E5=8A=A8=E5=8D=95?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java | 2 ++
 .../mes/apiservice/serviceimpl/base/MesPullingOrderPartInfoService.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java
index c789920..2782864 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java
@@ -235,6 +235,8 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
                     pullingOrderPartInfo.setLocation(partInfo.getPullAddr());//todo
                     pullingOrderPartInfo.setStatus(MesExtEnumUtil.PULL_ORDER_PART_STATUS.UN_SENTED.getValue());///明细已送料为1，未送料为0
                     pullingOrderPartInfo.setCustPartNo(pullingOrder.getCustPartNo());
+                    pullingOrderPartInfo.setColor(10);
+                    pullingOrderPartInfo.setCarSeries(partInfo.getCarSeries());
 
                     ConvertBean.serviceModelInitialize(pullingOrderPartInfo, userName);
                     mesPullingOrderPartInfoRepository.insert(pullingOrderPartInfo);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderPartInfoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderPartInfoService.java
index e70ef29..f2ef7df 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderPartInfoService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderPartInfoService.java
@@ -23,6 +23,7 @@ public class MesPullingOrderPartInfoService extends BaseMesService<MesPullingOrd
 
 
     protected void setPackQueryBean(MesPullingOrderPartInfo bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getPullingOrderNo(), "pullingOrderNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getWorkOrderNo(), "workOrderNo", packBean);