From 810b7977568354aca7cbbbbe61705a059e9bb7b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Thu, 5 Dec 2024 10:14:42 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=9D=E5=AD=98=E5=88=9B=E5=BB=BA=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=92=8C=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEservice=E6=96=B9=E6=B3=95=EF=BC=8C=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/impl/SysMakeOrderServiceImpl.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
index ba05e6d2..e3858c66 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
@@ -623,6 +623,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
     public int addProduceInboundSave(ErpInboundOrder erpInboundOrder) {
         String loginName = ShiroUtils.getLoginName();
         String makeNo = erpInboundOrder.getMakeNo();
+        SysMakeOrder makeOrder = sysMakeOrderMapper.selectMakeOrderByMakeNo(makeNo);
         erpInboundOrder.setCreateBy(loginName);
         erpInboundOrder.setCreateTime(DateUtils.getNowDate());
         List<ErpInboundOrderDetail> inboundDetails = erpInboundOrder.getInboundDetails();
@@ -658,6 +659,12 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
             List<AfterSalesShippingDevice> deviceList = inboundDetail.getSalesShippingDeviceList();
             if(StringUtils.isNotEmpty(deviceList)){
                 for (AfterSalesShippingDevice device:deviceList) {
+                    device.setMaterialModelCode(makeorderBom.getMaterialModel());
+                    device.setMaterialType(makeorderBom.getMaterialType());
+                    device.setMaterialUnit(makeorderBom.getUnit());
+                    device.setMakeName(loginName);//生产员
+                    device.setCustomerId(makeOrder.getCustomerId());
+                    device.setCustomerName(makeOrder.getCustomerName());
                     QualityShippingDevice qualityDevice = generateQualityShippingDevice(qualityOrderCode,device);
                     int insertDeviceResult = qualityDeviceMapper.insertQualityShippingDevice(qualityDevice);
                     if(insertDeviceResult<=0){