2024年1月3日16:23:37

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/mapper/TWhgenlegMapper.java

@@ -338,4 +338,6 @@ public interface TWhgenlegMapper {
      * @param fId
      */
     void unlock(String fId);
+
+    List<Map<String, Object>> selectInventoryListV1(TWhgenleg tWhgenleg);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -10489,7 +10489,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 map.put("name", goods.getfName());
                 map.put("spec", goods.getfPackagespecs());
                 map.put("producer", "无");
-                map.put("brand", "无");
+                List<Map<String, Object>> mapList = tWhgenlegMapper.selectInventoryListV1(tWhgenleg);
+                System.out.println("参数mapList：" + mapList);
+                if (mapList.size() > 0) {
+                    System.out.println("参数materialQuality：" + mapList.toString());
+                    map.put("brand", mapList.get(0).get("fMarks").toString());
+                } else {
+                    map.put("brand", "无");
+                }
                 map.put("level", "无");
 
                 SysDictData sysDictData = new SysDictData();
@@ -10570,7 +10577,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 公钥
         String appKey = "D0fJZ22Gn4BTE7qd";
         // 请求地址
-        String url = "https://sdpftz-console-test.pub.jdtiot.com/open/wms/receiptDistributeGoodsResult";
+//        String url = "https://sdpftz-console-test.pub.jdtiot.com/open/wms/receiptDistributeGoodsResult";
+        String url = "https://sdpftz-console.ai-warehouse.com/open/wms/receiptDistributeGoodsResult";
 
         String appSecret = "Qrgx3tn2tGqdIkvwIK0rcdckdYDG3caF";
 

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -802,7 +802,7 @@
             <if test="fGrossweightblc != null ">and leg.f_grossweightblc = #{fGrossweightblc}</if>
             <if test="fNetweightblc != null ">and leg.f_netweightblc = #{fNetweightblc}</if>
             <if test="fCntrno != null  and fCntrno != ''">and leg.f_cntrno LIKE  concat('%', #{fCntrno}, '%')</if>
-            <if test="fMblno != null ">and leg.f_mblno LIKE  concat('%', #{fMblno}, '%') </if>
+            <if test="fMblno != null ">and leg.f_mblno = #{fMblno} </if>
             <if test="fStatus != null  and fStatus != ''">and leg.f_status = #{fStatus}</if>
 
             <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid} </if>
@@ -940,7 +940,7 @@
         corp.f_id as fCorpid,
         # 商品
         goods.f_no AS sku,
-        goods.f_typeid AS spu,
+        sdd.dict_label AS spu,
         goods.f_id as goodsId,
         # 仓库编号
         ware.f_no as fWarehouseNo,
@@ -971,6 +971,7 @@
         LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
         LEFT JOIN t_customer_contact tc ON tc.f_pid = corp.f_id
         LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
+        LEFT JOIN sys_dict_data sdd ON sdd.dict_type = 'data_goods_category' and  goods.f_typeid = sdd.dict_value
         <if test="isCntrno != 2 ">LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid</if>
         <if test="isCntrno == 2 ">LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouseid</if>
         LEFT JOIN sys_dict_data dict ON dict.dict_value = leg.f_business_type
@@ -988,7 +989,7 @@
             AND dict.dict_type = 'storage_type'
             AND dict1.dict_type = 'data_trademodes'
             <if test="sku != null and sku != ''">and goods.f_no = #{sku}</if>
-            <if test="spu != null and spu != ''">and goods.f_typeid = #{spu}</if>
+            <if test="spu != null and spu != ''">and sdd.dict_label = #{spu}</if>
             <if test="warehouseNo != null and warehouseNo != ''">and ware.f_no = #{warehouseNo}</if>
             <if test="customerId != null and customerId != ''">and corp.f_id = #{customerId}</if>
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
@@ -996,7 +997,7 @@
             <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
             <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
             <if test="fShipper != null and fShipper != ''">and leg.f_shipper like concat('%', #{fShipper}, '%')</if>
-            <if test="fMblno != null ">and leg.f_mblno LIKE  concat('%', #{fMblno}, '%') </if>
+            <if test="fMblno != null ">and leg.f_mblno =#{fMblno} </if>
             <if test='orgStorageDate != null and orgStorageDate[0] != null and orgStorageDate[0]!= ""'>and leg.f_originalbilldate &gt;= #{orgStorageDate[0]}</if>
             <if test='orgStorageDate != null and orgStorageDate[1] != null and orgStorageDate[1]!= ""'>and leg.f_originalbilldate &lt;= #{orgStorageDate[1]}</if>
             <if test="fPregrossweight != null ">and leg.f_pregrossweight = #{fPregrossweight}</if>
@@ -1838,6 +1839,108 @@
             <if test="fMblno != null ">and leg.f_mblno = #{fMblno}</if>
         </where>
     </select>
+    <select id="selectInventoryListV1" resultType="java.util.Map">
+        select
+        DISTINCT
+        leg.f_id AS fId,
+        leg.f_corpid AS fCorpIds,
+        leg.f_bsdate AS fBsdate,
+        corp.f_name AS fCorpid,
+        leg.f_shipper AS fShipper,
+        ware.f_warehouse_information AS fWarehouseids,
+        area.f_name AS fWarehouseLocationids,
+        leg.f_originalbillno AS fOriginalbillno,
+        leg.f_warehouse_locationid AS fWarehouseLocationid,
+        dict1.dict_label AS fTrademodeid,
+        goods.f_name AS fGoodsids,
+        leg.f_trademodeid AS fTrademodeids,
+        goods.f_packagespecs AS fPackagespecs,
+        leg.f_goodsid AS fGoodsid,
+        leg.f_volumnD AS fVolumnD,
+        leg.f_qtyD AS fQtyD,
+        leg.f_mblno AS fMblno,
+        leg.f_grossweightD AS fGrossweightD,
+        leg.f_netweightD AS fNetweightD,
+        leg.f_volumnC AS fVolumnC,
+        leg.f_volumnblc AS fVolumnblc,
+        leg.f_qtyC AS fQtyC,
+        leg.f_business_type AS fBusinessType,
+        leg.f_grossweightC AS fGrossweightC,
+        leg.f_netweightC AS fNetweightC,
+        leg.f_qtyblc AS fQtyblc,
+        leg.f_billingway AS fBillingway,
+        leg.f_chargedate AS fChargedate,
+        leg.f_grossweightblc AS fGrossweightblc,
+        leg.f_netweightblc AS fNetweightblc,
+        leg.f_localcntrno AS fLocalcntrno,
+        dict.dict_label AS fBusinessTypes,
+        leg.f_marks AS fMarks,
+        goods.f_no AS sku,
+        goods.f_typeid AS spu,
+        leg.f_warehouseid AS fWarehouseId,
+        DATE_FORMAT( leg.create_time, '%Y-%m-%d' ) AS createTime,
+        DATE_FORMAT( leg.f_originalbilldate, '%Y-%m-%d' ) AS fOriginalbilldate,
+        leg.f_cntrno AS fCntrno
+        FROM
+        t_whgenleg leg
+        left join sys_user u on leg.create_by = u.user_name
+        left join sys_dept d on u.dept_id = d.dept_id
+        LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
+        LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
+        LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid
+        LEFT JOIN sys_dict_data dict ON dict.dict_value = leg.f_business_type
+        LEFT JOIN t_warehouse_area area ON area.f_id = leg.f_warehouse_locationid
+        LEFT JOIN sys_dict_data dict1 ON dict1.dict_value = leg.f_trademodeid
+        <where>
+            dict.status = '0'
+            AND dict1.status = '0'
+            AND dict.dict_type = 'storage_type'
+            AND dict1.dict_type = 'data_trademodes'
+            AND leg.f_qtyD != 0
+            AND leg.f_qtyblc &gt; 0
+            AND leg.f_grossweightblc &gt; 0
+            AND leg.f_netweightblc &gt; 0
+            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
+            <if test="warehouseInformation != null  and warehouseInformation != ''">and ware.f_warehouse_information = #{warehouseInformation}</if>
+            <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
+            <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
+            <if test="fShipper != null and fShipper != ''">and leg.f_shipper like concat('%', #{fShipper}, '%')</if>
+            <if test='orgStorageDate != null and orgStorageDate[0] != null and orgStorageDate[0]!= ""'>
+                and leg.f_originalbilldate &gt;= #{orgStorageDate[0]}
+            </if>
+            <if test='orgStorageDate != null and orgStorageDate[1] != null and orgStorageDate[1]!= ""'>
+                and leg.f_originalbilldate &lt;= #{orgStorageDate[1]}
+            </if>
+            <if test="fPregrossweight != null ">and leg.f_pregrossweight = #{fPregrossweight}</if>
+            <if test="fPrenetweight != null ">and leg.f_prenetweight = #{fPrenetweight}</if>
+            <if test="fQtyd != null ">and leg.f_qtyD = #{fQtyd}</if>
+            <if test="fTrademodeid != null ">and leg.f_trademodeid = #{fTrademodeid}</if>
+            <if test="fGoodsid != null ">and leg.f_goodsid = #{fGoodsid}</if>
+            <if test="fVolumnd != null ">and leg.f_volumnD = #{fVolumnd}</if>
+            <if test="fGrossweightd != null ">and leg.f_grossweightD = #{fGrossweightd}</if>
+            <if test="fNetweightd != null ">and leg.f_netweightD = #{fNetweightd}</if>
+            <if test="fVolumnc != null ">and leg.f_volumnC = #{fVolumnc}</if>
+            <if test="fQtyc != null ">and leg.f_qtyC = #{fQtyc}</if>
+            <if test="fOriginalbilldate != null ">and leg.f_originalbilldate = #{fOriginalbilldate}</if>
+            <if test="fMarks != null  and fMarks != ''">and leg.f_marks LIKE  concat('%', #{fMarks}, '%')</if>
+            <if test="fQtyblc != null ">and leg.f_qtyblc = #{fQtyblc}</if>
+            <if test="fGrossweightc != null ">and leg.f_grossweightC = #{fGrossweightc}</if>
+            <if test="fNetweightc != null ">and leg.f_netweightC = #{fNetweightc}</if>
+            <if test="fGrossweightblc != null ">and leg.f_grossweightblc = #{fGrossweightblc}</if>
+            <if test="fNetweightblc != null ">and leg.f_netweightblc = #{fNetweightblc}</if>
+            <if test="fCntrno != null  and fCntrno != ''">and leg.f_cntrno LIKE  concat('%', #{fCntrno}, '%')</if>
+            <if test="fMblno != null ">and leg.f_mblno LIKE  concat('%', #{fMblno}, '%') </if>
+            <if test="fStatus != null  and fStatus != ''">and leg.f_status = #{fStatus}</if>
+
+            <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid} </if>
+            <if test="fLocation != null  and fLocation ==1 ">
+                and leg.f_warehouse_locationid = #{fWarehouseLocationid}
+            </if>
+            <if test="fLocation != null  and fLocation ==0 ">
+                and ware.ancestors  LIKE  concat('%', #{fWarehouseLocationid}, '%')
+            </if>
+        </where>
+    </select>
     <update id="changeBelongTo" parameterType="TWhgenleg">
         update t_whgenleg
         <trim prefix="SET" suffixOverrides=",">