|
|
@ -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
|
|
|
|
// 入动作
|
|
|
|