From 6e27d549dd395113be89e455b4861e87e6f319df Mon Sep 17 00:00:00 2001
From: zhangke <sunwill6677@>
Date: Tue, 10 Mar 2026 10:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/wms/admin/controller/PackingController.java | 12 +++++++++---
 .../src/main/resources/mapper/WmsPackageMapper.xml   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
index 5175fc31..4a84ec74 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.nflg.wms.admin.service.BasdeSerialNumberControllerService;
 import com.nflg.wms.common.constant.BarCodeProcessStage;
+import com.nflg.wms.common.constant.UserType;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.dto.PackageChildDTO;
@@ -39,6 +40,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 /**
  * 打包管理
  */
@@ -96,7 +98,7 @@ public class PackingController extends BaseController {
                 .eq(WmsPackage::getId, request.getId())
                 .one();
         VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsPackage)).throwMessage("打包码不存在");
-      //  VUtil.trueThrowBusinessError(wmsPackage.getSupplierId() != UserUtil.getUserId()).throwMessage("非登录供应商，不可编辑");
+        //  VUtil.trueThrowBusinessError(wmsPackage.getSupplierId() != UserUtil.getUserId()).throwMessage("非登录供应商，不可编辑");
         VUtil.trueThrowBusinessError(wmsPackage.getPackageStatus() == 2).throwMessage("已收货，不可以编辑");
         packageService.lambdaUpdate().eq(WmsPackage::getId, request.getId())
                 .set(WmsPackage::getPackageName, request.getPackingName())
@@ -139,6 +141,10 @@ public class PackingController extends BaseController {
     @PostMapping("search")
     @ApiMark(moduleName = "获取包装码信息", apiName = "获取包装码信息")
     public ApiResult<PageData<PackingVO>> search(@Valid @RequestBody PackingSearchQO request) {
+        // 判断是否是供应商
+        if (UserUtil.getType() == UserType.Supplier) {
+            request.setSupplierId(UserUtil.getUserId());
+        }
         return ApiResult.success(packageService.serach(request));
     }
 
@@ -179,7 +185,7 @@ public class PackingController extends BaseController {
 // 首先判断当前包是否已经收货了
         WmsPackage wmsPackage = packageService.lambdaQuery()
                 .eq(WmsPackage::getPackageCode, request.getPackageCode())
-             //   .eq(WmsPackage::getSupplierId, UserUtil.getUserId())
+                //   .eq(WmsPackage::getSupplierId, UserUtil.getUserId())
                 .one();
         VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsPackage)).throwMessage("打包码不存在");
         VUtil.trueThrowBusinessError(wmsPackage.getPackageStatus() == 2).throwMessage("此打包码已收货");
@@ -379,7 +385,7 @@ public class PackingController extends BaseController {
             item.setDeliveryNo(qo.getDeliveryNo());
             item.setDeliveryLineNo(qo.getDeliveryLineNo());
             item.setSrmOrderItemId(qo.getSrmOrderItemId());
-            item.setPackageStatus((short)0);
+            item.setPackageStatus((short) 0);
             item.setCreateUserId(UserUtil.getUserId());
             item.setCreateUserName(UserUtil.getUserName());
             item.setCreateTime(LocalDateTime.now());
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
index 4e677ac3..da51c4aa 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
@@ -28,7 +28,7 @@
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.PackingVO">
         select a.*,b.supplier_code,b.supplier_name from wms_package a
-        left join user_supplier b on a.supplier_id=b."id"
+        left join user_supplier b on a.supplier_id=b.user_id
         <where>
             <if test="request.packingCode !=null and request.packingCode !=''">
                 and a.package_code ilike concat('%', #{request.packingCode}, '%')