From 332827b60d65e21e958d2899d39e5961dfd2507d Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Thu, 6 Nov 2025 17:13:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20PDA=E7=9B=98=E7=82=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/api/WmsPdaApiController.java | 17 ++++++++++-------
 .../wms/service/impl/WmsPdaApiServiceImpl.java  |  7 ++++---
 2 files changed, 14 insertions(+), 10 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 af642428..92230a4f 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
@@ -219,13 +219,16 @@ public class WmsPdaApiController extends BaseController {
         if (wmsInventory.getInventoryQty().compareTo(outstockRecord.getOutstockQty()) < 0) {
             R.fail("当前库位库存为：" + wmsInventory.getInventoryQty());
         }
-        double outSum = wmsInventory.getOutSum();//已经出库数量
+      /*
+      double outSum = wmsInventory.getOutSum();//已经出库数量
 
-        // BigDecimal allocateOrderQty = wmsInventory.getAllocateOrderQty();//计划数量
-        // BigDecimal outstockQty = outstockRecord.getOutstockQty();//出库数量
-        // if (allocateOrderQty.compareTo(outstockQty.add(BigDecimal.valueOf(outSum)))   <0) {
-        //       return  R.fail("出库超量");
-        // }
+
+         BigDecimal allocateOrderQty = wmsInventory.getAllocateOrderQty();//计划数量
+         BigDecimal outstockQty = outstockRecord.getOutstockQty();//出库数量
+         if (allocateOrderQty.compareTo(outstockQty.add(BigDecimal.valueOf(outSum)))   <0) {
+               return  R.fail("出库超量");
+         }
+        */
 
 
         Boolean result = apiService.rawOutSubmit(outstockRecord, wmsInventory);
@@ -531,7 +534,7 @@ public class WmsPdaApiController extends BaseController {
     private R<Void> allocateinSubmit(@RequestBody WmsAllocateTaskVo vo) {
         // List<WmsAllocateTaskVo> list = wmsAllocateTaskService.allocateSelectCode(code);
         // return list == null ? R.fail() : R.ok(list.get(0));
-        WmsAllocateTaskBo bo=new WmsAllocateTaskBo();
+        WmsAllocateTaskBo bo = new WmsAllocateTaskBo();
         bo.setAllocateTaskId(vo.getAllocateTaskId());
         bo.setInboundStatus("1");
         bo.setUpdateTime(new Date());
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 8696c6b2..6330ff65 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
@@ -391,7 +391,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
     public List<WmsBaseLocationVo> storeCheckSelectLocation(String type, Long storeId) {
 
 
-        if (type.equals("原材料盘点")) {
+        if (type.equals("盘点")) {
             return apiMapper.selectRawCheckLocationList(storeId);
         } else if (type.equals("半成品盘点")) {
             return apiMapper.selectSemiCheckLocationList(storeId);
@@ -406,7 +406,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
     public WmsInventoryCheck storeCheckSubmitOrder(String type, Long storeId, List<String> list) {
         String tag = DateUtils.dateTime();
         String tabName = null;
-        if (type.equals("原材料盘点")) {
+        if (type.equals("盘点")) {
             tabName = "wms_inventory_check";
         } else if (type.equals("半成品盘点")) {
             tabName = "wms_inventory_check_2";
@@ -426,13 +426,14 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         insert.setPlanWarehouseId(storeId);
         insert.setCreateBy(LoginHelper.getUserId());
         insert.setTenantId(LoginHelper.getTenantId());
+        insert.setBeginTime(new Date());
         wmsInventoryCheckMapper.insertTable(tabName, insert);
         return insert;
     }
 
     @Override
     public List<WmsInventoryVo> storeCheckSelectInventory(String locationCode, String type) {
-        if (type.equals("原材料盘点")) {
+        if (type.equals("盘点")) {
             MPJLambdaWrapper<WmsInventory> lqw = JoinWrappers.lambda(WmsInventory.class);
             lqw.eq(WmsInventory::getLocationCode, locationCode);
             return wmsInventoryMapper.selectVoList(lqw);