2023年12月1日17:04:54

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/ForeignApiController.java

@@ -113,16 +113,17 @@ public class ForeignApiController extends BaseController {
                                                          @RequestParam(value = "areaCode",required = false) String areaCode,
                                                          @RequestParam(value = "slotName",required = false) String slotName,
                                                          @RequestParam(value = "slotCode",required = false) String slotCode,
+                                                         @RequestParam(value = "goodsCode",required = false) String goodsCode,
                                                          @RequestParam(value = "pageNo") Integer pageNo,
                                                          @RequestParam(value = "pageSize") Integer pageSize) {
 
         List<Map<String, Object>> listSize = foreignHttpService.queryGoodsAccountDetailByPageV1(warehouseCode, ownerName, ownerCode, ownerSocialIdentifier, goodsName, specifications,
-                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode,goodsCode, pageNo, pageSize);
 
         WMSStartPage(pageNo, pageSize);
 
         List<Map<String, Object>> list = foreignHttpService.queryGoodsAccountDetailByPageV1(warehouseCode, ownerName, ownerCode, ownerSocialIdentifier, goodsName, specifications,
-                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode,goodsCode, pageNo, pageSize);
 
         TableDataInfo tableDataInfo = getDataTable(list);
 

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/ForeignHttpService.java

@@ -41,7 +41,7 @@ public interface ForeignHttpService {
      */
     List<Map<String, Object>> queryGoodsAccountDetailByPageV1(String warehouseCode,String ownerName,String ownerCode,String ownerSocialIdentifier,String goodsName,String specifications,
                                                         String producing,String materialQuality,String level, String receiptDoc,String billOfLading,
-                                                        String areaName,String areaCode,String slotName,String slotCode,Integer pageNo,Integer pageSize);
+                                                        String areaName,String areaCode,String slotName,String slotCode,String goodsCode,Integer pageNo,Integer pageSize);
 
     /**
      *  获取仓库详细信息

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/impl/ForeignHttpServiceImpl.java

@@ -133,9 +133,9 @@ public class ForeignHttpServiceImpl implements ForeignHttpService {
     @Override
     public List<Map<String, Object>> queryGoodsAccountDetailByPageV1(String warehouseCode, String ownerName, String ownerCode, String ownerSocialIdentifier, String goodsName, String specifications,
                                                                      String producing, String materialQuality, String level, String receiptDoc, String billOfLading,
-                                                                     String areaName, String areaCode, String slotName, String slotCode, Integer pageNo, Integer pageSize) {
+                                                                     String areaName, String areaCode, String slotName, String slotCode,String goodsCode, Integer pageNo, Integer pageSize) {
         return itWarehouseService.queryGoodsAccountDetailByPageV1(warehouseCode, ownerName, ownerCode, ownerSocialIdentifier, goodsName, specifications,
-                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode,goodsCode, pageNo, pageSize);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TWarehouseMapper.java

@@ -214,6 +214,7 @@ public interface TWarehouseMapper {
                                                               @Param("areaCode") String areaCode,
                                                               @Param("slotName") String slotName,
                                                               @Param("slotCode") String slotCode,
+                                                              @Param("goodsCode") String goodsCode,
                                                               @Param("pageNo") Integer pageNo,
                                                               @Param("pageSize") Integer pageSize);
 

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITWarehouseService.java

@@ -216,7 +216,7 @@ public interface ITWarehouseService {
      */
     List<Map<String,Object>> queryGoodsAccountDetailByPageV1(String warehouseCode,String ownerName,String ownerCode,String ownerSocialIdentifier, String goodsName,String specifications,
                                                              String producing,String materialQuality,String level, String receiptDoc,String billOfLading,
-                                                             String areaName,String areaCode,String slotName,String slotCode,Integer pageNo,Integer pageSize);
+                                                             String areaName,String areaCode,String slotName,String slotCode,String goodsCode,Integer pageNo,Integer pageSize);
 
     /**
      *  获取仓库详细信息

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -547,13 +547,13 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
     @Override
     public List<Map<String, Object>> queryGoodsAccountDetailByPageV1(String warehouseCode, String ownerName, String ownerCode, String ownerSocialIdentifier, String goodsName, String specifications,
                                                                      String producing, String materialQuality, String level, String receiptDoc, String billOfLading,
-                                                                     String areaName, String areaCode, String slotName, String slotCode, Integer pageNo, Integer pageSize) {
+                                                                     String areaName, String areaCode, String slotName, String slotCode,String goodsCode, Integer pageNo, Integer pageSize) {
         if ("null".equals(warehouseCode)) {
             warehouseCode = null;
         }
 
         List<Map<String, Object>> maps = tWarehouseMapper.queryGoodsAccountDetailByPageV1(warehouseCode, ownerName, ownerCode, ownerSocialIdentifier, goodsName, specifications,
-                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode,goodsCode, pageNo, pageSize);
 
         for (Map<String, Object> map : maps) {
             if (map.get("storesTime") != null) {

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -478,6 +478,7 @@
             <if test="ownerCode != null  and ownerCode != ''"> and TC.f_id = #{ownerCode}</if>
             <if test="ownerSocialIdentifier != null  and ownerSocialIdentifier != ''"> and TC.uscc = #{ownerSocialIdentifier}</if>
             <if test="goodsName != null  and goodsName != ''"> and TG.f_name like concat('%', #{goodsName}, '%')</if>
+            <if test="goodsCode != null  and goodsCode != ''"> and TG.f_no = #{goodsCode}</if>
             <if test="specifications != null  and specifications != ''"> and TG.f_packagespecs like concat('%', #{specifications}, '%')</if>
             <if test="materialQuality != null  and materialQuality != ''"> and TWG.f_marks like concat('%', #{materialQuality}, '%')</if>
             <if test="receiptDoc != null  and receiptDoc != ''"> and TWG.f_originalbillno like concat('%', #{receiptDoc}, '%')</if>