2024年2月5日17:11:28

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.plugin;
 
 import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ruoyi.ccb.domain.QueryLowerPositionR;
 import com.ruoyi.ccb.service.ForeignHttpService;
 import com.ruoyi.common.core.controller.BaseController;
@@ -56,24 +57,30 @@ public class ForeignApiController extends BaseController {
      * @return 结果
      */
     @PostMapping("/queryGoodsAccountByPageV1")
-    public Map<String, Object> queryGoodsAccountByPageV1(@RequestParam(value = "warehouseCode",required = false) String warehouseCode,
-                                                         @RequestParam(value = "ownerSocialIdentifier",required = false) String ownerSocialIdentifier,
-                                                         @RequestParam(value = "ownerCode",required = false) String ownerCode,
-                                                         @RequestParam(value = "ownerName",required = false) String ownerName,
-                                                         @RequestParam(value = "goodsName",required = false) String goodsName,
-                                                         @RequestParam(value = "specifications",required = false) String specifications,
-                                                         @RequestParam(value = "producing",required = false) String producing,
-                                                         @RequestParam(value = "materialQuality",required = false) String materialQuality,
-                                                         @RequestParam(value = "level",required = false) String level,
-                                                         @RequestParam(value = "pageNo",required = false) Integer pageNo,
-                                                         @RequestParam(value = "pageSize",required = false) Integer pageSize) {
-        List<Map<String, Object>> listSize = foreignHttpService.queryGoodsAccountByPageV1(warehouseCode,ownerSocialIdentifier,ownerCode, ownerName, goodsName, specifications,
-                producing, materialQuality, level, pageNo, pageSize);
+    public Map<String, Object> queryGoodsAccountByPageV1(@RequestParam(value = "warehouseCode", required = false) String warehouseCode,
+                                                         @RequestParam(value = "ownerSocialIdentifier", required = false) String ownerSocialIdentifier,
+                                                         @RequestParam(value = "ownerCode", required = false) String ownerCode,
+                                                         @RequestParam(value = "ownerName", required = false) String ownerName,
+                                                         @RequestParam(value = "goodsName", required = false) String goodsName,
+                                                         @RequestParam(value = "specifications", required = false) String specifications,
+                                                         @RequestParam(value = "producing", required = false) String producing,
+                                                         @RequestParam(value = "materialQuality", required = false) String materialQuality,
+                                                         @RequestParam(value = "level", required = false) String level,
+                                                         @RequestParam(value = "lockStatus", required = false) String lockStatus,
+                                                         @RequestParam(value = "pageNo", required = false) Integer pageNo,
+                                                         @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        if (ObjectUtils.isNotNull(lockStatus)) {
+            lockStatus = "1";
+        } else {
+            lockStatus = "0";
+        }
+        List<Map<String, Object>> listSize = foreignHttpService.queryGoodsAccountByPageV1(warehouseCode, ownerSocialIdentifier, ownerCode, ownerName, goodsName, specifications,
+                producing, materialQuality, level, pageNo, pageSize, lockStatus);
 
         WMSStartPage(pageNo, pageSize);
 
-        List<Map<String, Object>> list = foreignHttpService.queryGoodsAccountByPageV1(warehouseCode,ownerSocialIdentifier,ownerCode, ownerName, goodsName, specifications,
-                producing, materialQuality, level, pageNo, pageSize);
+        List<Map<String, Object>> list = foreignHttpService.queryGoodsAccountByPageV1(warehouseCode, ownerSocialIdentifier, ownerCode, ownerName, goodsName, specifications,
+                producing, materialQuality, level, pageNo, pageSize, lockStatus);
 
         TableDataInfo tableDataInfo = getDataTable(list);
 
@@ -85,7 +92,7 @@ public class ForeignApiController extends BaseController {
         data.put("pageCount", listSize.size() / pageSize);
 
         Map<String, Object> mapR = new HashMap<>();
-        mapR.put("code","0");
+        mapR.put("code", "0");
         mapR.put("msg", "OK");
         mapR.put("data", data);
 
@@ -98,32 +105,37 @@ public class ForeignApiController extends BaseController {
      * @return 结果
      */
     @PostMapping("/queryGoodsAccountDetailByPageV1")
-    public Map<String, Object> queryGoodsAccountByPageV1(@RequestParam(value = "warehouseCode",required = false) String warehouseCode,
-                                                         @RequestParam(value = "ownerName",required = false) String ownerName,
-                                                         @RequestParam(value = "ownerCode",required = false) String ownerCode,
-                                                         @RequestParam(value = "ownerSocialIdentifier",required = false) String ownerSocialIdentifier,
-                                                         @RequestParam(value = "goodsName",required = false) String goodsName,
-                                                         @RequestParam(value = "specifications",required = false) String specifications,
-                                                         @RequestParam(value = "producing",required = false) String producing,
-                                                         @RequestParam(value = "materialQuality",required = false) String materialQuality,
-                                                         @RequestParam(value = "level",required = false) String level,
-                                                         @RequestParam(value = "receiptDoc",required = false) String receiptDoc,
-                                                         @RequestParam(value = "billOfLading",required = false) String billOfLading,
-                                                         @RequestParam(value = "areaName",required = false) String areaName,
-                                                         @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,
+    public Map<String, Object> queryGoodsAccountByPageV1(@RequestParam(value = "warehouseCode", required = false) String warehouseCode,
+                                                         @RequestParam(value = "ownerName", required = false) String ownerName,
+                                                         @RequestParam(value = "ownerCode", required = false) String ownerCode,
+                                                         @RequestParam(value = "ownerSocialIdentifier", required = false) String ownerSocialIdentifier,
+                                                         @RequestParam(value = "goodsName", required = false) String goodsName,
+                                                         @RequestParam(value = "specifications", required = false) String specifications,
+                                                         @RequestParam(value = "producing", required = false) String producing,
+                                                         @RequestParam(value = "materialQuality", required = false) String materialQuality,
+                                                         @RequestParam(value = "level", required = false) String level,
+                                                         @RequestParam(value = "receiptDoc", required = false) String receiptDoc,
+                                                         @RequestParam(value = "billOfLading", required = false) String billOfLading,
+                                                         @RequestParam(value = "areaName", required = false) String areaName,
+                                                         @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 = "lockStatus", required = false) String lockStatus,
                                                          @RequestParam(value = "pageNo") Integer pageNo,
                                                          @RequestParam(value = "pageSize") Integer pageSize) {
-
+        if (ObjectUtils.isNotNull(lockStatus)) {
+            lockStatus = "1";
+        } else {
+            lockStatus = "0";
+        }
         List<Map<String, Object>> listSize = foreignHttpService.queryGoodsAccountDetailByPageV1(warehouseCode, ownerName, ownerCode, ownerSocialIdentifier, goodsName, specifications,
-                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode,goodsCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, goodsCode, pageNo, pageSize, lockStatus);
 
         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,goodsCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, goodsCode, pageNo, pageSize, lockStatus);
 
         TableDataInfo tableDataInfo = getDataTable(list);
 
@@ -135,7 +147,7 @@ public class ForeignApiController extends BaseController {
         data.put("pageCount", listSize.size() / pageSize);
 
         Map<String, Object> mapR = new HashMap<>();
-        mapR.put("code","0");
+        mapR.put("code", "0");
         mapR.put("msg", "OK");
         mapR.put("data", data);
 
@@ -146,7 +158,7 @@ public class ForeignApiController extends BaseController {
      * WMS作业通知数字仓库系统接⼝
      */
     @PostMapping("/workNoticeV1")
-    public Map<String, Object> workNoticeV1(JSONObject jsonObject){
+    public Map<String, Object> workNoticeV1(JSONObject jsonObject) {
         return foreignHttpService.workNoticeV1(jsonObject);
     }
 
@@ -228,7 +240,4 @@ public class ForeignApiController extends BaseController {
     }
 
 
-
-
-
 }

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

@@ -34,14 +34,14 @@ public interface ForeignHttpService {
      * 查询货物台账
      */
     List<Map<String, Object>> queryGoodsAccountByPageV1(String warehouseCode, String ownerSocialIdentifier, String ownerCode, String ownerName, String goodsName, String specifications, String producing,
-                                                        String materialQuality, String level, Integer pageNo, Integer pageSize);
+                                                        String materialQuality, String level, Integer pageNo, Integer pageSize,String lockStatus);
 
     /**
      * 查询货物台账明细
      */
     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,String goodsCode,Integer pageNo,Integer pageSize);
+                                                        String areaName,String areaCode,String slotName,String slotCode,String goodsCode,Integer pageNo,Integer pageSize,String lockStatus);
 
     /**
      *  获取仓库详细信息

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

@@ -120,9 +120,9 @@ public class ForeignHttpServiceImpl implements ForeignHttpService {
                                                                String materialQuality,
                                                                String level,
                                                                Integer pageNo,
-                                                               Integer pageSize) {
+                                                               Integer pageSize,String lockStatus) {
         return itWarehouseService.queryGoodsAccountByPageV1(warehouseCode, ownerSocialIdentifier, ownerCode, ownerName, goodsName, specifications,
-                producing, materialQuality, level, pageNo, pageSize);
+                producing, materialQuality, level, pageNo, pageSize,lockStatus);
 
     }
 
@@ -132,9 +132,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, String goodsCode, Integer pageNo, Integer pageSize) {
+                                                                     String areaName, String areaCode, String slotName, String slotCode, String goodsCode, Integer pageNo, Integer pageSize,String lockStatus) {
         return itWarehouseService.queryGoodsAccountDetailByPageV1(warehouseCode, ownerName, ownerCode, ownerSocialIdentifier, goodsName, specifications,
-                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, goodsCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode, goodsCode, pageNo, pageSize,lockStatus);
     }
 
     /**

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

@@ -196,7 +196,8 @@ public interface TWarehouseMapper {
                                                         @Param("materialQuality") String materialQuality,
                                                         @Param("level") String level,
                                                         @Param("pageNo") Integer pageNo,
-                                                        @Param("pageSize") Integer pageSize);
+                                                        @Param("pageSize") Integer pageSize,
+                                                        @Param("lockStatus")String lockStatus);
 
 
     List<Map<String, Object>> queryGoodsAccountDetailByPageV1(@Param("warehouseCode") String warehouseCode,
@@ -216,7 +217,8 @@ public interface TWarehouseMapper {
                                                               @Param("slotCode") String slotCode,
                                                               @Param("goodsCode") String goodsCode,
                                                               @Param("pageNo") Integer pageNo,
-                                                              @Param("pageSize") Integer pageSize);
+                                                              @Param("pageSize") Integer pageSize,
+                                                              @Param("lockStatus")String lockStatus);
 
     /**
      *  获取仓库详细信息

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

@@ -209,14 +209,14 @@ public interface ITWarehouseService {
                                                        String materialQuality,
                                                        String level,
                                                        Integer pageNo,
-                                                       Integer pageSize);
+                                                       Integer pageSize,String lockStatus);
 
     /**
      * 查询台账明细
      */
     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,String goodsCode,Integer pageNo,Integer pageSize);
+                                                             String areaName,String areaCode,String slotName,String slotCode,String goodsCode,Integer pageNo,Integer pageSize,String lockStatus);
 
     /**
      *  获取仓库详细信息

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

@@ -536,24 +536,24 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
                                                                String materialQuality,
                                                                String level,
                                                                Integer pageNo,
-                                                               Integer pageSize) {
+                                                               Integer pageSize,String lockStatus) {
         if ("null".equals(warehouseCode)) {
             warehouseCode = null;
         }
         return tWarehouseMapper.queryGoodsAccountByPageV1(warehouseCode, ownerSocialIdentifier, ownerCode, ownerName, goodsName, specifications,
-                producing, materialQuality, level, pageNo, pageSize);
+                producing, materialQuality, level, pageNo, pageSize,lockStatus);
     }
 
     @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,String goodsCode, Integer pageNo, Integer pageSize) {
+                                                                     String areaName, String areaCode, String slotName, String slotCode,String goodsCode, Integer pageNo, Integer pageSize,String lockStatus) {
         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,goodsCode, pageNo, pageSize);
+                producing, materialQuality, level, receiptDoc, billOfLading, areaName, areaCode, slotName, slotCode,goodsCode, pageNo, pageSize,lockStatus);
 
         for (Map<String, Object> map : maps) {
             if (map.get("storesTime") != null) {

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

@@ -10421,14 +10421,34 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         reqBody.put("remark", a.getRemark());
         reqBody.put("storageName", a.getStorageName());
         reqBody.put("storageContractCode", a.getStorageContractCode());
-//改        reqBody.put("storageContractStart", a.getStorageContractStart());
-        reqBody.put("storageContractStart", a.getfBsdate());
+        List<SkuItem> skuItemList = a.getSkuItemList();
+        if (skuItemList.size() > 0) {
+            TWarehouseBills tWarehouseBills = warehouseBillsMapper.selectBYOriginalBillNo(skuItemList.get(0).getEnterCode());
+            if (tWarehouseBills != null){
+                if (ObjectUtils.isNull(tWarehouseBills.getfBsdate())) {
+                    throw new RuntimeException("入库日期不能为空");
+                }
+                DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                reqBody.put("storageContractStart", df.format(tWarehouseBills.getfBsdate()));
+
+                if (ObjectUtils.isNull(tWarehouseBills.getfChargedate())) {
+                    throw new RuntimeException("入库日期不能为空");
+                }
+                DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                reqBody.put("storagePayTime", df1.format(tWarehouseBills.getfChargedate()));
+            }else{
+                reqBody.put("storageContractStart", a.getStorageContractStart());// 改
+                reqBody.put("storagePayTime", a.getStoragePayTime());//改
+            }
+        } else {
+            reqBody.put("storageContractStart", a.getStorageContractStart());// 改
+            reqBody.put("storagePayTime", a.getStoragePayTime());//改
+        }
         reqBody.put("storageContractEnd", a.getStorageContractEnd());
 //        reqBody.put("warehouseCode", warehouseMaser.getfNo());
         reqBody.put("warehouseCode", warehouseMaser.getfId());
         reqBody.put("warehouseName", warehouseMaser.getfName());
         reqBody.put("storageRate", a.getStorageRate());
-        reqBody.put("storagePayTime", a.getfChargedate());
 //改        reqBody.put("storagePayTime", a.getStoragePayTime());
         reqBody.put("insuranceCode", a.getInsuranceCode());
         reqBody.put("insuranceAmount", a.getInsuranceAmount());
@@ -10441,9 +10461,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
         reqBody.put("operationType", "10");
 
-        List<SkuItem> skuItemList = a.getSkuItemList();
-
-
         List<Map<String, Object>> goodsMap = new ArrayList<>();
         for (SkuItem skuItem : skuItemList) {
             List<CollateralGoodsVO> collateralGoodsList = collateralMapper.selectByPid(skuItem.getId().toString());
@@ -10582,8 +10599,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.ai-warehouse.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/basicData/TWarehouseMapper.xml

@@ -423,6 +423,7 @@
         <where>
             TW.del_flag = '0'
             and TWG.f_qtyblc > 0
+            <if test="lockStatus != null  and lockStatus != '' and lockStatus == '1'">and TWG.lock_status != '1'</if>
             <if test="warehouseCode != null  and warehouseCode != ''">and TW.f_id = #{warehouseCode}</if>
             <if test="ownerName != null  and ownerName != ''">and TC.f_name like concat('%', #{ownerName}, '%')</if>
             <if test="goodsName != null  and goodsName != ''">and TG.f_name like concat('%', #{goodsName}, '%')</if>
@@ -487,8 +488,8 @@
         <where>
             TW.del_flag = '0'
             and TWG.f_qtyblc > 0
-            and TWG.lock_status ='0'
             and TWB.del_flag = '0'
+            <if test="lockStatus != null  and lockStatus != '' and lockStatus == '1'">and TWG.lock_status != '1'</if>
             <if test="warehouseCode != null  and warehouseCode != ''">and TWG.f_warehouseid = #{warehouseCode}</if>
             <if test="ownerName != null  and ownerName != ''">and TC.f_name like concat('%', #{ownerName}, '%')</if>
             <if test="ownerCode != null  and ownerCode != ''">and TC.f_id = #{ownerCode}</if>
@@ -515,6 +516,7 @@
             <if test="slotCode != null  and slotCode != ''">and ware.f_id = #{slotCode}</if>
         </where>
     </select>
+    <!--and TWG.lock_status ='0'-->
 
     <select id="getWareHouseInfo" parameterType="String" resultMap="TWarehouseResult">
         <include refid="selectTWarehouseVo"/>

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

@@ -935,7 +935,7 @@
         # 总数
         SUM(leg.f_qtyD) AS fQtyD,
         # 毛重
-        SUM(leg.f_grossweightD) AS fGrossweightD,
+        SUM(leg.f_netweightD) AS fGrossweightD,
         # 客户id
         corp.f_id as fCorpid,
         # 商品