制品返修修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java

@@ -101,7 +101,7 @@ public class ProductrepairRequestDetailaServiceImpl implements ProductrepairRequ
         // 校验--工位基础信息
         if(StringUtils.isNotEmpty(detailDo.getWorkStationCode())){
             WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailDo.getWorkStationCode(), mainDO.getWorkshopCode(), detailDo.getProductionLineCode());
-            detailDo.setFromLocationCode(workstationDO.getFgLocationCode());
+            detailDo.setFromLocationCode(workstationDO.getRawLocationCode());
         }
         // 校验--库存余额 TB——>TB1
         validateBalance(detailDo,mainDO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java

@@ -171,7 +171,7 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
                     ConsumeRecordDetailbDO consumeRecordDetailbDO = ConsumeRecordDetailbConvert.INSTANCE.convert(productrepairRequestDetailbDO);
                     consumeRecordDetailbDO.setMasterId(productrepairRecordDetailDO.getId());
                     consumeRecordDetailbMapper.insert(consumeRecordDetailbDO);
-                }
+
                     //添加库存事务list
                     TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
                     BeanUtils.copyProperties(productrepairRecordDetailDO, transactionCreateReqVO);
@@ -181,16 +181,19 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest
                     transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
                     transactionCreateReqVO.setBusinessType(productrepairRecordMainDO.getBusinessType());
                     transactionCreateReqVO.setOwnerCode(productrepairRecordDetailDO.getFromOwnerCode());
+                    transactionCreateReqVO.setItemCode(consumeRecordDetailbDO.getItemCode());
                     transactionCreateReqVO.setRecordNumber(number);
                     transactionCreateReqVO.setId(null);
-                transactionCreateReqVO.setPackingNumber(productrepairRecordDetailDO.getPackingNumber());
+                    transactionCreateReqVO.setPackingNumber(consumeRecordDetailbDO.getPackingNumber());
-                transactionCreateReqVO.setBatch(productrepairRecordDetailDO.getBatch());
+                    transactionCreateReqVO.setBatch(consumeRecordDetailbDO.getBatch());
-                transactionCreateReqVO.setContainerNumber(productrepairRecordDetailDO.getContainerNumber());
+                    transactionCreateReqVO.setContainerNumber(null);
                     transactionCreateReqVO.setAmount(BigDecimal.ZERO);
                     transactionCreateReqVO.setWarehouseCode(productrepairRecordMainDO.getFromWarehouseCode());
                     transactionCreateReqVO.setLocationCode(productrepairRecordDetailDO.getToLocationCode());
                     transactionCreateReqVOList.add(transactionCreateReqVO);
                 }
+
+            }
             //增加库存事务
             transactionService.createTransaction(transactionCreateReqVOList);
         }