上架修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -448,7 +448,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         purchasereceiptRecordDetailDO.setNumber(purchasereceiptRecordMainDO.getNumber());
         purchasereceiptRecordDetailDO.setJobDetailId(String.valueOf(purchasereceiptJobDetailDO.getId()));
         purchasereceiptRecordDetailDO.setFromBatch(purchasereceiptJobDetailDO.getBatch());
-        purchasereceiptRecordDetailDO.setToBatch(purchasereceiptJobDetailUpdateReqVO.getToBatch());
+        purchasereceiptRecordDetailDO.setToBatch(purchasereceiptJobDetailDO.getBatch());
         purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
         purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
         purchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVO.getHandleQty());
@@ -539,7 +539,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                     childePurchasereceiptRecordDetailDO.setNumber(purchasereceiptRecordMainDO.getNumber());
                     childePurchasereceiptRecordDetailDO.setJobDetailId(String.valueOf(tempJobDetail.getId()));
                     childePurchasereceiptRecordDetailDO.setFromBatch(tempJobDetail.getBatch());
-                    childePurchasereceiptRecordDetailDO.setToBatch(purchasereceiptJobDetailUpdateReqVO.getToBatch());
+                    childePurchasereceiptRecordDetailDO.setToBatch(tempJobDetail.getBatch());
                     childePurchasereceiptRecordDetailDO.setFromPackingNumber(tempJobDetail.getPackingNumber());
                     childePurchasereceiptRecordDetailDO.setToPackingNumber(tempJobDetail.getPackingNumber());
                     childePurchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVO.getHandleQty());
@@ -586,7 +586,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                     // 生成退货记录
                     PurchasereturnRecordDetailCreateReqVO purchasereturnRecordDetailCreateReqVO = new PurchasereturnRecordDetailCreateReqVO();
                     BeanUtils.copyProperties(purchasereceiptJobDetailDO,purchasereturnRecordDetailCreateReqVO);
-                    log.info("部分收货，生成退货记录请求参数AAAAAA:{}",purchasereceiptJobDetailDO);
                     purchasereturnRecordDetailCreateReqVO.setToBatch(purchasereceiptJobDetailDO.getBatch());
                     purchasereturnRecordDetailCreateReqVO.setFromBatch(purchasereceiptJobDetailDO.getBatch());
                     purchasereturnRecordDetailCreateReqVO.setSinglePrice(childPurchaseshortageDetailDO.getSinglePrice());
@@ -623,7 +622,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
         purchasereceiptRecordDetailDO.setNumber(purchasereceiptRecordMainDO.getNumber());
         purchasereceiptRecordDetailDO.setJobDetailId(String.valueOf(purchasereceiptJobDetailDO.getId()));
         purchasereceiptRecordDetailDO.setFromBatch(purchasereceiptJobDetailDO.getBatch());
-        purchasereceiptRecordDetailDO.setToBatch(purchasereceiptJobDetailUpdateReqVO.getToBatch());
+        purchasereceiptRecordDetailDO.setToBatch(purchasereceiptJobDetailDO.getBatch());
         purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
         purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailUpdateReqVO.getToPackingNumber());
         purchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVO.getHandleQty());
@@ -652,7 +651,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 childePurchasereceiptRecordDetailDO.setNumber(purchasereceiptRecordMainDO.getNumber());
                 childePurchasereceiptRecordDetailDO.setJobDetailId(String.valueOf(temp.getId()));
                 childePurchasereceiptRecordDetailDO.setFromBatch(temp.getBatch());
-                childePurchasereceiptRecordDetailDO.setToBatch(allReceiptJobDetail.getToBatch());
+                childePurchasereceiptRecordDetailDO.setToBatch(temp.getBatch());
                 childePurchasereceiptRecordDetailDO.setFromPackingNumber(temp.getPackingNumber());
                 childePurchasereceiptRecordDetailDO.setToPackingNumber(allReceiptJobDetail.getToPackingNumber());
                 childePurchasereceiptRecordDetailDO.setQty(allReceiptJobDetail.getHandleQty());