From 799ac02088221a21063da4bd0dd53a8bc60f0d09 Mon Sep 17 00:00:00 2001
From: zhangke <git_1949@163.com>
Date: Tue, 23 Sep 2025 11:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=92=A2=E6=9E=84?=
 =?UTF-8?q?=E5=8C=85=E5=92=8C=E6=99=AE=E9=80=9A=E7=89=A9=E6=96=99=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9D=A1=E7=A0=81=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=92=8C?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=BAId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/wms/admin/controller/NormalOrderController.java    | 2 +-
 .../src/main/resources/mapper/WmsNormalPrintOrderMapper.xml     | 2 +-
 .../resources/mapper/WmsStructuralPackageOrderTrayMapper.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java
index 3df3afe7..3056b16b 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java
@@ -107,7 +107,7 @@ public class NormalOrderController extends BaseController {
             VUtil.trueThrowBusinessError(Objects.isNull(supplier)).throwMessage("供应商不存在");
             if (Objects.isNull(item.getId())) {
                 item.setOrderNo(orderNo);
-                item.setSupplierId(supplier.getUserId());
+                item.setSupplierId(supplier.getId());
                 item.setCreateBy(UserUtil.getUserName());
                 item.setCreateTime(LocalDateTime.now());
                 forAdd.add(item);
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsNormalPrintOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsNormalPrintOrderMapper.xml
index 4011b8a3..407c2eb1 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsNormalPrintOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsNormalPrintOrderMapper.xml
@@ -4,7 +4,7 @@
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverNormalOrderVO">
         select o.*,us.supplier_name,us.supplier_code as "supplier_no"
         from wms_normal_print_order o
-        left join user_supplier us on o.supplier_id=us.user_id
+        left join user_supplier us on o.supplier_id=us.id
         <where>
             <if test="request.supplierNo!=null and request.supplierNo!=''">
                 and us.supplier_code=#{request.supplierNo}
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
index 037c8780..861570b7 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
@@ -8,7 +8,7 @@
         ,sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state,spdom.deliver_id
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
-        LEFT JOIN user_supplier us ON o.supplier_id=us.user_id
+        LEFT JOIN user_supplier us ON o.supplier_id=us.id
         LEFT JOIN wms_structural_package sp ON o.package_id=sp."id"
         LEFT JOIN wms_model m on o.model_id=m."id"
         inner join wms_structural_package_order_tray ot on o.id=ot.order_id