From 49480954294989260e8947d305bb2abbc8b1a44f Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 14 Mar 2024 14:31:01 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/entity/ProductionWarehouseData.java   |  2 ++
 .../app/service/impl/FunctionServiceImpl.java | 32 +++++++++++--------
 .../static/js/pda/transferWarehousing2.js     |  2 +-
 .../js/pda/transferWarehousing2ForHunlian.js  |  1 +
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/heai/modules/app/entity/ProductionWarehouseData.java b/src/main/java/com/heai/modules/app/entity/ProductionWarehouseData.java
index 335934a..f9007b8 100644
--- a/src/main/java/com/heai/modules/app/entity/ProductionWarehouseData.java
+++ b/src/main/java/com/heai/modules/app/entity/ProductionWarehouseData.java
@@ -43,4 +43,6 @@ public class ProductionWarehouseData {
     private Double warehouseQtyKG;
 
     private Integer printNumber;
+
+    private String useLocationFlag;
 }
diff --git a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
index 14faeef..9801ac1 100644
--- a/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
+++ b/src/main/java/com/heai/modules/app/service/impl/FunctionServiceImpl.java
@@ -167,13 +167,15 @@ public class FunctionServiceImpl implements FunctionService {
     @Override
     @Transactional
     public R saveSOReceiveFGTransFer(ProductionWarehouseData productionWarehouseData) throws ParseException {
-        List<LocationData> checkLocationId= dailyPlanMapper.checkLocationId(productionWarehouseData);
-        if(checkLocationId.size()==0){
-            throw new RuntimeException("该库位不存在！");
-        }
-        List<LocationData> checkLocation=wareHouseDao.checkLocation(productionWarehouseData.getSite(), productionWarehouseData.getWarehouseId(),productionWarehouseData.getLocationId());
-        if(checkLocation.size()==0){
-            throw new RuntimeException("工厂 "+productionWarehouseData.getSite()+" 的所选仓库中不存在库位："+productionWarehouseData.getLocationId());
+        if(productionWarehouseData.getUseLocationFlag()==null||"Y".equals(productionWarehouseData.getUseLocationFlag())){
+            List<LocationData> checkLocationId= dailyPlanMapper.checkLocationId(productionWarehouseData);
+            if(checkLocationId.size()==0){
+                throw new RuntimeException("该库位不存在！");
+            }
+            List<LocationData> checkLocation=wareHouseDao.checkLocation(productionWarehouseData.getSite(), productionWarehouseData.getWarehouseId(),productionWarehouseData.getLocationId());
+            if(checkLocation.size()==0){
+                throw new RuntimeException("工厂 "+productionWarehouseData.getSite()+" 的所选仓库中不存在库位："+productionWarehouseData.getLocationId());
+            }
         }
         List<Object> params = new ArrayList<>();
         params.add(productionWarehouseData.getSite());
@@ -201,13 +203,15 @@ public class FunctionServiceImpl implements FunctionService {
     @Override
     @Transactional
     public R saveSOReceiveFGTransFerHunlian(ProductionWarehouseData productionWarehouseData) throws ParseException {
-        List<LocationData> checkLocationId= dailyPlanMapper.checkLocationId(productionWarehouseData);
-        if(checkLocationId.size()==0){
-            throw new RuntimeException("该库位不存在！");
-        }
-        List<LocationData> checkLocation=wareHouseDao.checkLocation(productionWarehouseData.getSite(), productionWarehouseData.getWarehouseId(),productionWarehouseData.getLocationId());
-        if(checkLocation.size()==0){
-            throw new RuntimeException("工厂 "+productionWarehouseData.getSite()+" 的所选仓库中不存在库位："+productionWarehouseData.getLocationId());
+        if(productionWarehouseData.getUseLocationFlag()==null||"Y".equals(productionWarehouseData.getUseLocationFlag())){
+            List<LocationData> checkLocationId= dailyPlanMapper.checkLocationId(productionWarehouseData);
+            if(checkLocationId.size()==0){
+                throw new RuntimeException("该库位不存在！");
+            }
+            List<LocationData> checkLocation=wareHouseDao.checkLocation(productionWarehouseData.getSite(), productionWarehouseData.getWarehouseId(),productionWarehouseData.getLocationId());
+            if(checkLocation.size()==0){
+                throw new RuntimeException("工厂 "+productionWarehouseData.getSite()+" 的所选仓库中不存在库位："+productionWarehouseData.getLocationId());
+            }
         }
         String taskNo=productionWarehouseData.getOrderNo();
         HunlianData inData=new HunlianData();
diff --git a/src/main/resources/static/js/pda/transferWarehousing2.js b/src/main/resources/static/js/pda/transferWarehousing2.js
index 648b40e..c1634a9 100644
--- a/src/main/resources/static/js/pda/transferWarehousing2.js
+++ b/src/main/resources/static/js/pda/transferWarehousing2.js
@@ -288,7 +288,7 @@ function saveProduction(){
         transFerNo:currentData.transFerNo,
         printNumber:printNumber,
         functionName : "[dbo].[SO_Receive_FG_TransFer]",
-
+        useLocationFlag:wareHouseData.UseLocation,
     }
     $.ajax({
         url: "/pdaOrder/saveSOReceiveFGTransFer",
diff --git a/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js b/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js
index 5cea3ac..adefb77 100644
--- a/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js
+++ b/src/main/resources/static/js/pda/transferWarehousing2ForHunlian.js
@@ -311,6 +311,7 @@ function saveProduction(){
         // selectList:selectData,
         // warehouseQtyKG:warehouseQty,
         functionName : "[dbo].[SO_Receive_FG_TransFer_Hunlian]",
+        useLocationFlag:wareHouseData.UseLocation,
     }
     $.ajax({
         url: "/pdaOrder/saveSOReceiveFGTransFerHunlian",