修复bug

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExportReqVO.java

@@ -115,4 +115,6 @@ public class CustomerreceiptRecordDetailExportReqVO {
     @Schema(description = "到批次")
     private String toBatch;
 
+    @Schema(description = "主表id")
+    private String masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailPageReqVO.java

@@ -117,4 +117,6 @@ public class CustomerreceiptRecordDetailPageReqVO extends PageParam {
     @Schema(description = "到批次")
     private String toBatch;
 
+    @Schema(description = "主表id")
+    private String masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreceiptRecord/CustomerreceiptRecordDetailMapper.java

@@ -23,6 +23,7 @@ public interface CustomerreceiptRecordDetailMapper extends BaseMapperX<Customerr
 
     default PageResult<CustomerreceiptRecordDetailDO> selectPage(CustomerreceiptRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CustomerreceiptRecordDetailDO>()
+                .eqIfPresent(CustomerreceiptRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomerreceiptRecordDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomerreceiptRecordDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomerreceiptRecordDetailDO::getFromBatch, reqVO.getFromBatch())
@@ -63,6 +64,7 @@ public interface CustomerreceiptRecordDetailMapper extends BaseMapperX<Customerr
     }
     default List<CustomerreceiptRecordDetailDO> selectList(CustomerreceiptRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CustomerreceiptRecordDetailDO>()
+                .eqIfPresent(CustomerreceiptRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomerreceiptRecordDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomerreceiptRecordDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomerreceiptRecordDetailDO::getFromBatch, reqVO.getFromBatch())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customersettleRecord/CustomersettleRecordDetailMapper.java

@@ -24,6 +24,7 @@ public interface CustomersettleRecordDetailMapper extends BaseMapperX<Customerse
     default PageResult<CustomersettleRecordDetailDO> selectPage(CustomersettleRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<CustomersettleRecordDetailDO>()
                 .eqIfPresent(CustomersettleRecordDetailDO::getSoNumber, reqVO.getSoNumber())
+                .eqIfPresent(CustomersettleRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomersettleRecordDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomersettleRecordDetailDO::getOwnerCode, reqVO.getOwnerCode())
                 .eqIfPresent(CustomersettleRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())
@@ -56,6 +57,7 @@ public interface CustomersettleRecordDetailMapper extends BaseMapperX<Customerse
     }
     default List<CustomersettleRecordDetailDO> selectList(CustomersettleRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CustomersettleRecordDetailDO>()
+                .eqIfPresent(CustomersettleRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(CustomersettleRecordDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(CustomersettleRecordDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(CustomersettleRecordDetailDO::getOwnerCode, reqVO.getOwnerCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreceiptRequest/CustomerreceiptRequestMainServiceImpl.java

@@ -22,8 +22,11 @@ import com.win.module.wms.convert.customerreceiptRecord.CustomerreceiptRecordMai
 import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestDetailConvert;
 import com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
+import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO;
+import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordMainDO;
 import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO;
 import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestMainDO;
+import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.mysql.customerreceiptRecord.CustomerreceiptRecordDetailMapper;
@@ -32,6 +35,7 @@ import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptReques
 import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestMainMapper;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
+import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
@@ -90,6 +94,9 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
     @Resource
     private AdminUserApi userApi;
 
+    @Resource
+    private LocationService locationService;
+
     @Override
     public Long createCustomerreceiptRequestMain(CustomerreceiptRequestMainCreateReqVO createReqVO) {
         // 插入
@@ -318,21 +325,44 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
      */
     private void generateRecord(CustomerreceiptRequestMainDO mainDO, List<CustomerreceiptRequestDetailDO> detailDOList) {
         if ("TRUE".equals(mainDO.getDirectCreateRecord())) {
-            CustomerreceiptRecordMainCreateReqVO customerreceiptRecordMainCreateReqVO = new CustomerreceiptRecordMainCreateReqVO();
+            CustomerreceiptRecordMainDO customerreceiptRecordMainDO = new CustomerreceiptRecordMainDO();
-            BeanUtils.copyProperties(mainDO, customerreceiptRecordMainCreateReqVO);
+            BeanUtils.copyProperties(mainDO, customerreceiptRecordMainDO);
-            customerreceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
+            customerreceiptRecordMainDO.setRequestNumber(mainDO.getNumber());
             String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_RECEIPT_REQUEST.getCode());
-            customerreceiptRecordMainCreateReqVO.setNumber(number);
+            customerreceiptRecordMainDO.setNumber(number);
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerReceiptRecord");
-            customerreceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
+            customerreceiptRecordMainDO.setBusinessType(businesstypeDO.getCode());
-            customerreceiptRecordMainMapper.insert(CustomerreceiptRecordMainConvert.INSTANCE.convert(customerreceiptRecordMainCreateReqVO));
+            customerreceiptRecordMainMapper.insert(customerreceiptRecordMainDO);
             List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
             for (CustomerreceiptRequestDetailDO customerreceiptRequestDetailDO : detailDOList) {
-                CustomerreceiptRecordDetailCreateReqVO customerreceiptRecordDetailCreateReqVO = new CustomerreceiptRecordDetailCreateReqVO();
+                CustomerreceiptRecordDetailDO customerreceiptRecordDetailDO = new CustomerreceiptRecordDetailDO();
-                BeanUtils.copyProperties(customerreceiptRequestDetailDO, customerreceiptRecordDetailCreateReqVO);
+                BeanUtils.copyProperties(customerreceiptRequestDetailDO, customerreceiptRecordDetailDO);
-                customerreceiptRecordDetailCreateReqVO.setNumber(number);
+                customerreceiptRecordDetailDO.setNumber(number);
-                customerreceiptRecordDetailMapper.insert(CustomerreceiptRecordDetailConvert.INSTANCE.convert(customerreceiptRecordDetailCreateReqVO));
+                customerreceiptRecordDetailDO.setFromBatch(customerreceiptRequestDetailDO.getBatch());
+                customerreceiptRecordDetailDO.setFromPackingNumber(customerreceiptRequestDetailDO.getPackingNumber());
+                customerreceiptRecordDetailDO.setFromContainerNumber(customerreceiptRequestDetailDO.getContainerNumber());
+                customerreceiptRecordDetailDO.setFromOwnerCode(customerreceiptRequestDetailDO.getFromOwnerCode());
+                LocationDO fromLocationDO = locationService.selectLocation(customerreceiptRequestDetailDO.getFromLocationCode());
+                if(fromLocationDO != null){
+                    customerreceiptRecordDetailDO.setFromLocationCode(fromLocationDO.getCode());
+                    customerreceiptRecordDetailDO.setFromAreaCode(fromLocationDO.getAreaCode());
+                    customerreceiptRecordDetailDO.setFromLocationGroupCode(fromLocationDO.getLocationGroupCode());
+                }
+                customerreceiptRecordDetailDO.setToBatch(customerreceiptRequestDetailDO.getBatch());
+                customerreceiptRecordDetailDO.setToPackingNumber(customerreceiptRequestDetailDO.getPackingNumber());
+                LocationDO toLocationDO = locationService.selectLocation(customerreceiptRequestDetailDO.getToLocationCode());
+                if(toLocationDO != null){
+                    customerreceiptRecordDetailDO.setToLocationCode(toLocationDO.getCode());
+                    customerreceiptRecordDetailDO.setToAreaCode(toLocationDO.getAreaCode());
+                    customerreceiptRecordDetailDO.setToLocationGroupCode(toLocationDO.getLocationGroupCode());
+                }
+                customerreceiptRecordDetailDO.setToContainerNumber(customerreceiptRequestDetailDO.getContainerNumber());
+                customerreceiptRecordDetailDO.setToOwnerCode(customerreceiptRequestDetailDO.getToOwnerCode());
+                customerreceiptRecordDetailDO.setAmount(BigDecimal.ZERO);
+                customerreceiptRecordDetailDO.setSinglePrice(BigDecimal.ZERO);
+                customerreceiptRecordDetailDO.setMasterId(customerreceiptRecordMainDO.getId().toString());
+                customerreceiptRecordDetailMapper.insert(customerreceiptRecordDetailDO);
                 //添加库存事务list
                 TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
                 BeanUtils.copyProperties(customerreceiptRequestDetailDO, transactionCreateReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customersettleRequest/CustomersettleRequestMainServiceImpl.java

@@ -291,9 +291,9 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
             //添加库存事务list
             TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
             BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO);
-            String inTransactionType = businesstypeDO.getInTransactionType();
+            String outTransactionType = businesstypeDO.getOutTransactionType();
-            if(inTransactionType != null && !"".equals(inTransactionType)){
+            if(outTransactionType != null && !"".equals(outTransactionType)){
-                TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(inTransactionType);
+                TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(outTransactionType);
                 transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
                 transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
             }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java

@@ -309,17 +309,17 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
             inventorymoveRecordDetailDO.setToContainerNumber(inventorymoveJobDetailUpdateReqVO.getToContainerNumber());
             inventorymoveRecordDetailDO.setToBatch(inventorymoveJobDetailUpdateReqVO.getToBatch());
             inventorymoveRecordDetailDO.setToLocationCode(inventorymoveJobDetailUpdateReqVO.getToLocationCode());
+            inventorymoveRecordDetailDO.setToInventoryStatus(inventorymoveJobDetailUpdateReqVO.getToInventoryStatus());
+            inventorymoveRecordDetailDO.setToAreaCode(inventorymoveJobMainDO.getToAreaCodes());
             LocationDO toLocationDO = locationService.selectLocation(inventorymoveJobDetailUpdateReqVO.getToLocationCode());
             inventorymoveRecordDetailDO.setToAreaCode(toLocationDO.getAreaCode());
             inventorymoveRecordDetailDO.setToLocationGroupCode(toLocationDO.getLocationGroupCode());
             LocationDO fromLocationDO = locationService.selectLocation(inventorymoveRecordDetailDO.getFromLocationCode());
             inventorymoveRecordDetailDO.setFromAreaCode(fromLocationDO.getAreaCode());
             inventorymoveRecordDetailDO.setFromLocationGroupCode(fromLocationDO.getLocationGroupCode());
-            inventorymoveRecordDetailDO.setToInventoryStatus(inventorymoveJobDetailUpdateReqVO.getToInventoryStatus());
             inventorymoveRecordDetailDO.setFromPackingNumber(inventorymoveJobDetailUpdateReqVO.getPackingNumber());
             inventorymoveRecordDetailDO.setFromContainerNumber(inventorymoveJobDetailUpdateReqVO.getContainerNumber());
             inventorymoveRecordDetailDO.setFromAreaCode(inventorymoveJobMainDO.getFromAreaCodes());
-            inventorymoveRecordDetailDO.setToAreaCode(inventorymoveJobMainDO.getToAreaCodes());
             inventorymoveRecordDetailDO.setFromBatch(inventorymoveJobDetailUpdateReqVO.getBatch());
             inventorymoveRecordDetailDO.setInterfaceType(inventorymoveRecordMainDO.getInterfaceType());
             inventorymoveRecordDetailDO.setFromInventoryStatus(inventorymoveJobDetailUpdateReqVO.getInventoryStatus());
@@ -343,8 +343,8 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
                 transactionCreateReqVO.setBatch(inventorymoveJobDetailUpdateReqVO.getToBatch());
                 transactionCreateReqVO.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getToContainerNumber());
                 transactionCreateReqVO.setInventoryStatus(inventorymoveJobDetailUpdateReqVO.getToInventoryStatus());
-                transactionCreateReqVO.setAmount(BigDecimal.ZERO);
                 transactionCreateReqVO.setLocationCode(inventorymoveJobDetailUpdateReqVO.getToLocationCode());
+                transactionCreateReqVO.setAmount(BigDecimal.ZERO);
                 transactionCreateReqVOList.add(transactionCreateReqVO);
             }
             // 出动作
@@ -363,8 +363,8 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ
                 transactionCreateReqVOOut.setBatch(inventorymoveJobDetailUpdateReqVO.getBatch());
                 transactionCreateReqVOOut.setContainerNumber(inventorymoveJobDetailUpdateReqVO.getContainerNumber());
                 transactionCreateReqVOOut.setInventoryStatus(inventorymoveRecordDetailDO.getFromInventoryStatus());
-                transactionCreateReqVOOut.setAmount(BigDecimal.ZERO);
                 transactionCreateReqVOOut.setLocationCode(inventorymoveJobDetailUpdateReqVO.getFromLocationCode());
+                transactionCreateReqVOOut.setAmount(BigDecimal.ZERO);
                 transactionCreateReqVOList.add(transactionCreateReqVOOut);
             }
         };