wms成品出库查询的修改

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;
 
 /**
  * 用户信息

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);
     /**
      * 成品销售出库----单箱扫码
      *

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

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">