From ff4d79bdf5aec3a97442f7aeb5d47545bc70f2a2 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Wed, 3 Sep 2025 10:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/wms/controller/api/WmsPdaApiController.java | 6 +++++-
 .../java/org/dromara/wms/mapper/WmsInstockPrintMapper.java  | 2 +-
 .../main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java   | 2 ++
 .../java/org/dromara/wms/service/IWmsPdaApiService.java     | 2 ++
 .../org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java  | 5 +++++
 .../src/main/resources/mapper/wms/WmsPdaApiMapper.xml       | 4 ++++
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java
index 85f2208e..1ba5311f 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java
@@ -66,17 +66,21 @@ public class WmsPdaApiController extends BaseController {
     // 退库入库提交
     @PostMapping("/returnStore/submit")
     public R<Void> returnStoreSubmit(@RequestBody WmsReturnOrderVo data) {
-        Boolean result  = wmsReturnOrderService.returnStoreSubmit(data);
+        Boolean result = wmsReturnOrderService.returnStoreSubmit(data);
         return toAjax(result);
     }
 
+    // 入库查询批次
     @PostMapping("/raw/inSelectCode")
     public R<WmsInstockPrintVo> inSelectCode(String code) {
         WmsInstockPrintVo wmsInstockPrintVo = apiService.inSelectCode(code);
         if (wmsInstockPrintVo == null) {
             R.fail();
         }
+        String locationCode = apiService.selectInstoreRecordLocaltionCode(wmsInstockPrintVo.getMaterialId());
+        wmsInstockPrintVo.setLocationCode(locationCode);
         return R.ok(wmsInstockPrintVo);
+
     }
 
     @PostMapping("/raw/inSubmit")
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockPrintMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockPrintMapper.java
index 16ffeeca..9cee7d5f 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockPrintMapper.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockPrintMapper.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface WmsInstockPrintMapper extends BaseMapperPlus<WmsInstockPrint, WmsInstockPrintVo> {
-    @Select("select top 1 material_spe,batch_code,material_categoryId,material_code,material_name,unit_name, " +
+    @Select("select top 1 material_spe,batch_code,material_code,material_name,unit_name, " +
         "             material_id,instock_print_id,apportion_qty,instock_code,material_qty " +
         "from wms_instock_print where batch_code=#{code}")
     WmsInstockPrintVo inSelectCode(String code);
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java
index ed99bb01..0c127f8a 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java
@@ -56,4 +56,6 @@ public interface WmsPdaApiMapper {
     WmsOutstockRecordVo setHppOutRecord(String code);
 
     int semiDeleteErrorCode(String code);
+
+    String selectInstoreRecordLocaltionCode(@Param("materialId") Long materialId);
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java
index 1f05c15b..a3a08926 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java
@@ -79,4 +79,6 @@ public interface IWmsPdaApiService {
     WmsInventoryVo ledgerSelect(String batchCode, String locationCode);
 
     boolean moveSubmit(WmsInventoryVo vo);
+
+    String selectInstoreRecordLocaltionCode(Long materialId);
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
index 3c98a508..15d2eadf 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
@@ -540,4 +540,9 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         int i = wmsInventoryMapper.updateById(inventory);
         return i > 0;
     }
+
+    @Override
+    public String selectInstoreRecordLocaltionCode(Long materialId) {
+        return apiMapper.selectInstoreRecordLocaltionCode(materialId);
+    }
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml
index 5e16be77..97bd9526 100644
--- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml
+++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml
@@ -176,5 +176,9 @@
         delete  from wms_hpp_in_stock_detail where card_no=#{code}
     </delete>
 
+    <select id="selectInstoreRecordLocaltionCode" resultType="String">
+        select top 1 location_code from wms_instock_record where material_id = #{materialId} order by create_time desc
+    </select>
+
 
 </mapper>