0412更新

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;
 }

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();

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",

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",