From f23b3c98eb13951f100fdaf2ed457fbc4e39a482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 27 Dec 2023 17:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E5=88=9B=E5=BB=BA=E8=AE=B0=E5=BD=95=20=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E7=AE=B1=E7=A0=81=E6=A0=B9=E6=8D=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E8=BF=9B=E8=A1=8C=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...roductdismantleRequestMainServiceImpl.java | 41 +++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java
index 094dbaa8..90541ab4 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java
@@ -539,8 +539,8 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR
                     BeanUtils.copyProperties(productdismantleRequestDetailbDO, productdismantleRecordDetailbDO);
                     productdismantleRecordDetailbDO.setMasterId(productdismantleRecordDetailaDO.getId());
                     productdismantleRecordDetailbDO.setNumber(productdismantleRecordDetailaDO.getNumber());
-                    productdismantleRecordDetailbDO.setBatch("000000");
-                    productdismantleRecordDetailbDO.setPackingNumber("");
+//                    productdismantleRecordDetailbDO.setBatch("000000");
+//                    productdismantleRecordDetailbDO.setPackingNumber("");
                     productdismantleRecordDetailbDO.setInventoryStatus("OK");
                     //  根据成品物品 对应工位 查询 原料库位
                     WorkstationDO workstationDO =  workstationService.selectWorkstationExist(productdismantleRecordDetailaDO.getWorkStationCode(),productdismantleRecordMainDO.getWorkshopCode(),productdismantleRecordDetailaDO.getProductionLineCode());
@@ -554,21 +554,28 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR
                     productdismantleRecordDetailbDO.setUpdateTime(null);
                     productdismantleRecordDetailbDO.setUpdater(null);
                     // 查询管理精度策略
-//                    RuleRespVO managementtRule = ruleService.management(null, null, productdismantleRequestDetailbDO.getItemCode(), workstationDO.getRawLocationCode(), null, null);
-//                    JSONObject jsonObject = new JSONObject(managementtRule.getConfiguration());
-//                    if(!"TRUE".equals(jsonObject.getStr("ManagementPrecision"))) {
-//                        this.deleteById(balanceDO.getId());
-//                    }
-//                    if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) {
-//                        balanceDOList = balanceService.selectByNumber(itemcode, inventoryStatus, locationcode);
-//                    } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) {
-//                        balanceDOList = balanceService.selectByBatch(itemcode, batch, inventoryStatus, locationcode);
-//                    } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) {
-//                        balanceDOList = balanceService.selectByPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode);
-//                    } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) {
-//                        balanceDOList = balanceService.selectByUniqueId(packingnumber, locationcode, inventoryStatus);
-//                    }
-
+                    RuleRespVO managementtRule = ruleService.management(null, null, productdismantleRequestDetailbDO.getItemCode(), workstationDO.getRawLocationCode(), null, null);
+                    JSONObject jsonObject = new JSONObject(managementtRule.getConfiguration());
+                    // 按数量管理
+                    if("BY_QUANTITY".equals(jsonObject.getStr("ManagementPrecision"))) {
+                        productdismantleRecordDetailbDO.setBatch("");
+                        productdismantleRecordDetailbDO.setPackingNumber("");
+                    }
+                    // 按批次管理
+                    if("BY_BATCH".equals(jsonObject.getStr("ManagementPrecision"))) {
+                        productdismantleRecordDetailbDO.setBatch("000000");
+                        productdismantleRecordDetailbDO.setPackingNumber("");
+                    }
+                    // 按包装管理
+                    if("BY_PACKAGING".equals(jsonObject.getStr("ManagementPrecision"))) {
+                        productdismantleRecordDetailbDO.setBatch("000000");
+                        productdismantleRecordDetailbDO.setPackingNumber(productdismantleRecordDetailbDO.getPackingNumber());
+                    }
+                    // 按唯一码管理
+                    if("BY_UNIQUE_ID".equals(jsonObject.getStr("ManagementPrecision"))) {
+                        productdismantleRecordDetailbDO.setBatch("000000");
+                        productdismantleRecordDetailbDO.setPackingNumber(productdismantleRecordDetailbDO.getPackingNumber());
+                    }
                     detailbDOList.add(productdismantleRecordDetailbDO);
                     //添加库存事务list
                     // 入动作