From bee7cff0c2e355f945b33ad2572db22f3b11ca1b Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 16 Oct 2024 15:12:08 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/system/controller/SysUserController.java  |  8 ++------
 .../op/wms/service/IWmsProductPutService.java    |  2 +-
 .../service/impl/WmsProductPutServiceImpl.java   | 16 +++-------------
 .../mapper/wms/WmsSellOutEmbryoMapper.xml        |  1 +
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java
index 45f374ed..f48236be 100644
--- a/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java
+++ b/op-modules/op-system/src/main/java/com/op/system/controller/SysUserController.java
@@ -6,6 +6,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
+import com.op.system.service.*;
 import org.slf4j.Logger;
 import javax.servlet.http.HttpServletResponse;
 
@@ -44,12 +46,6 @@ import com.op.system.api.domain.SysDept;
 import com.op.system.api.domain.SysRole;
 import com.op.system.api.domain.SysUser;
 import com.op.system.api.model.LoginUser;
-import com.op.system.service.ISysConfigService;
-import com.op.system.service.ISysDeptService;
-import com.op.system.service.ISysPermissionService;
-import com.op.system.service.ISysPostService;
-import com.op.system.service.ISysRoleService;
-import com.op.system.service.ISysUserService;
 
 /**
  * 用户信息
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
index fa1af2aa..766d1a9b 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
@@ -97,7 +97,7 @@ public interface IWmsProductPutService {
      * 成品销售出库----整托扫码
      *
      */
-    List<WmsProductPutTrayCode> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode);
+    List<WmsFpStorageNewsSn> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode);
     /**
      * 成品销售出库----单箱扫码
      *
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index 0d23c1bd..d44291c4 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -879,25 +879,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
     }
 
     @Override
-    public List<WmsProductPutTrayCode> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode) {
+    public List<WmsFpStorageNewsSn> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode) {
         DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
         wmsProductPutTrayCode.setRelatStatus("1");
-        List<WmsProductPutTrayCode>  wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);//sn
+//        List<WmsProductPutTrayCode>  wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);//sn
         WmsFpStorageNewsSn  wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
         wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
         wmsFpStorageNewsSn.setActiveFlag("1");
         List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=   wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
-        if (wmsFpStorageNewsSns.size()>0){
-            WmsFpStorageNewsSn  wmsFpStorageNewsSn1=     wmsFpStorageNewsSns.get(0);
-            for (WmsProductPutTrayCode  wmsProductPutTrayCode1:
-                    wmsProductPutTrayCodeList) {
-                wmsProductPutTrayCode1.setWlCode(wmsFpStorageNewsSn1.getWlCode());
-                wmsProductPutTrayCode1.setProductCode(wmsFpStorageNewsSn1.getProductCode());
-                wmsProductPutTrayCode1.setProductName(wmsFpStorageNewsSn1.getProductName());
-            }
-        }
-
-        return wmsProductPutTrayCodeList;
+        return wmsFpStorageNewsSns;
     }
 
     @Override
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml
index 3a82d9e9..c5d826fd 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml
@@ -124,6 +124,7 @@
             <if test="attr9 != null  and attr9 != ''">and attr9 = #{attr9}</if>
             <if test="attr10 != null  and attr10 != ''">and attr10 = #{attr10}</if>
         </where>
+        ORDER BY	create_time	DESC
     </select>
 
     <select id="selectWmsSellOutEmbryoById" parameterType="String" resultMap="WmsSellOutEmbryoResult">