制品报废修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java

@@ -139,7 +139,7 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest
         // 校验--工位基础信息
         if(StringUtils.isNotEmpty(detailCreateReqVO.getWorkStationCode())){
             WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailCreateReqVO.getWorkStationCode(), productscrapRequestMainDO.getWorkshopCode(), detailCreateReqVO.getProductionLineCode());
-            detailCreateReqVO.setFromLocationCode(workstationDO.getFgLocationCode());
+            detailCreateReqVO.setFromLocationCode(workstationDO.getRawLocationCode());
         }
         // 校验--uom
         // validatorUom(detailCreateReqVO.getUom(), itembasic.getUom());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java

@@ -179,26 +179,27 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa
                     RawscrapRecordDetailDO rawscrapRecordDetailDO = RawscrapRecordDetailConvert.INSTANCE.convert(rawscrapRequestDetailDO);
                     rawscrapRecordDetailDO.setMasterId(productscrapRecordDetailDO.getId());
                     rawscrapRecordDetailMapper.insert(rawscrapRecordDetailDO);
+                    //添加库存事务list
+                    TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
+                    BeanUtils.copyProperties(productscrapRecordDetailDO, transactionCreateReqVO);
+                    TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
+                    transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
+                    transactionCreateReqVO.setItemCode(rawscrapRecordDetailDO.getItemCode());
+                    transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
+                    transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
+                    transactionCreateReqVO.setBusinessType(productscrapRecordMainDO.getBusinessType());
+                    transactionCreateReqVO.setOwnerCode(productscrapRecordDetailDO.getFromOwnerCode());
+                    transactionCreateReqVO.setRecordNumber(number);
+                    transactionCreateReqVO.setId(null);
+                    transactionCreateReqVO.setPackingNumber(rawscrapRecordDetailDO.getPackingNumber());
+                    transactionCreateReqVO.setBatch(rawscrapRecordDetailDO.getBatch());
+                    transactionCreateReqVO.setInventoryStatus(rawscrapRecordDetailDO.getInventoryStatus());
+                    transactionCreateReqVO.setContainerNumber(productscrapRecordDetailDO.getContainerNumber());
+                    transactionCreateReqVO.setAmount(BigDecimal.ZERO);
+                    transactionCreateReqVO.setWarehouseCode(productscrapRecordMainDO.getFromWarehouseCode());
+                    transactionCreateReqVO.setLocationCode(productscrapRecordDetailDO.getFromLocationCode());
+                    transactionCreateReqVOList.add(transactionCreateReqVO);
                 }
-                //添加库存事务list
-                TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
-                BeanUtils.copyProperties(productscrapRecordDetailDO, transactionCreateReqVO);
-                TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
-                transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
-                transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
-                transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
-                transactionCreateReqVO.setBusinessType(productscrapRecordMainDO.getBusinessType());
-                transactionCreateReqVO.setOwnerCode(productscrapRecordDetailDO.getFromOwnerCode());
-                transactionCreateReqVO.setRecordNumber(number);
-                transactionCreateReqVO.setId(null);
-                transactionCreateReqVO.setPackingNumber("");
-                transactionCreateReqVO.setBatch("");
-                transactionCreateReqVO.setInventoryStatus("");
-                transactionCreateReqVO.setContainerNumber(productscrapRecordDetailDO.getContainerNumber());
-                transactionCreateReqVO.setAmount(BigDecimal.ZERO);
-                transactionCreateReqVO.setWarehouseCode(productscrapRecordMainDO.getFromWarehouseCode());
-                transactionCreateReqVO.setLocationCode(productscrapRecordDetailDO.getFromLocationCode());
-                transactionCreateReqVOList.add(transactionCreateReqVO);
             }
             //增加库存事务
             transactionService.createTransaction(transactionCreateReqVOList);