Merge remote-tracking branch 'origin/master'

win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/serialNumber/RuleCodeEnum.java

@@ -143,7 +143,7 @@ public enum RuleCodeEnum {
     CUSTOMER_DELIVER_NUMBER("CustomerDeliverNumber"),  // 客户发货单号
     LABEL_NUMBER("LabelNumber"),  // 标签流水号
     TRANSFER_RECEIPT_REQUEST("TransferReceiptRequest"),// 调拨接收申请
-    CONTAINER_INIT_RECORD(""), // 器具初始化记录
+    CONTAINER_INIT_RECORD("ContainerInitRecord"), // 器具初始化记录
     ;
 
     private final String code;

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

@@ -6,6 +6,7 @@ import com.win.framework.common.pojo.PageResult;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
+import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailCreateReqVO;
 import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordMainCreateReqVO;
@@ -24,6 +25,7 @@ import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 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.requestsetting.RequestsettingDO;
+import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.mysql.customerreceiptRecord.CustomerreceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.customerreceiptRecord.CustomerreceiptRecordMainMapper;
 import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptRequestDetailMapper;
@@ -31,6 +33,7 @@ import com.win.module.wms.dal.mysql.customerreceiptRequest.CustomerreceiptReques
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
+import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -38,12 +41,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;
 
 /**
@@ -79,6 +84,12 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
     @Resource
     private RequestsettingService requestsettingService;
 
+    @Resource
+    private TransactionService transactionService;
+
+    @Resource
+    private AdminUserApi userApi;
+
     @Override
     public Long createCustomerreceiptRequestMain(CustomerreceiptRequestMainCreateReqVO createReqVO) {
         // 插入
@@ -113,7 +124,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
             customerreceiptRequestDetailDO.setNumber(number);
         }
         customerreceiptRequestDetailMapper.insertBatch(subDOList);
-        trendsApi.createTrends(requestsettingDO.getId(), "CustomerReceiptRequest", "增加了客户收货申请", TrendsTypeEnum.CREATE);
+        trendsApi.createTrends(requestsettingDO.getId(), "CustomerReceipt", "增加了客户收货申请", TrendsTypeEnum.CREATE);
         // 返回
         return customerreceiptRequestMain.getId();
     }
@@ -125,7 +136,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
         // 更新
         CustomerreceiptRequestMainDO updateObj = CustomerreceiptRequestMainConvert.INSTANCE.convert(updateReqVO);
         customerreceiptRequestMainMapper.updateById(updateObj);
-        trendsApi.createTrends(updateReqVO.getId(), "CustomerReceiptRequest", "修改了客户收货申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(updateReqVO.getId(), "CustomerReceipt", "修改了客户收货申请", TrendsTypeEnum.UPDATE);
     }
 
     @Override
@@ -186,7 +197,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
             throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_CLOSE);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
-        trendsApi.createTrends(id, "CustomerReceiptRequest", "关闭了客户收货申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerReceipt", "关闭了客户收货申请", TrendsTypeEnum.UPDATE);
         return customerreceiptRequestMainMapper.updateById(mainDO);
     }
 
@@ -206,7 +217,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
             throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_RE_ADD);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
-        trendsApi.createTrends(id, "CustomerReceiptRequest", "打开了客户收货申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerReceipt", "打开了客户收货申请", TrendsTypeEnum.UPDATE);
         return customerreceiptRequestMainMapper.updateById(mainDO);
     }
 
@@ -229,7 +240,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
         if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
             this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId()));
         }
-        trendsApi.createTrends(id, "CustomerReceiptRequest", "提交了客户收货申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerReceipt", "提交了客户收货申请", TrendsTypeEnum.UPDATE);
         return customerreceiptRequestMainMapper.updateById(mainDO);
     }
 
@@ -253,7 +264,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
         if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
             this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId()));
         }
-        trendsApi.createTrends(id, "CustomerReceiptRequest", "审批同意了客户收货申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerReceipt", "审批同意了客户收货申请", TrendsTypeEnum.UPDATE);
         return customerreceiptRequestMainMapper.updateById(mainDO);
     }
 
@@ -275,7 +286,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
         mainDO.setStatus(requestStatusState.getState().getCode());
         //调用执行方法
         this.generateRecord(mainDO, customerreceiptRequestDetailMapper.selectList(mainDO.getId()));
-        trendsApi.createTrends(id, "CustomerReceiptRequest", "执行了客户收货申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerReceipt", "执行了客户收货申请", TrendsTypeEnum.UPDATE);
         return customerreceiptRequestMainMapper.updateById(mainDO);
     }
 
@@ -295,7 +306,7 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
             throw new ServiceException(CUSTOMERRECEIPT_REQUEST_CANNOT_REFUSED);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());
-        trendsApi.createTrends(id, "CustomerReceiptRequest", "审批驳回了客户收货申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerReceipt", "审批驳回了客户收货申请", TrendsTypeEnum.UPDATE);
         return customerreceiptRequestMainMapper.updateById(mainDO);
     }
 
@@ -316,15 +327,33 @@ public class CustomerreceiptRequestMainServiceImpl implements CustomerreceiptReq
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerReceiptRecord");
             customerreceiptRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
             customerreceiptRecordMainMapper.insert(CustomerreceiptRecordMainConvert.INSTANCE.convert(customerreceiptRecordMainCreateReqVO));
-            List<ExpectinCreateReqVO> expectinCreateReqVOList = new ArrayList<>();
-            List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
             List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
             for (CustomerreceiptRequestDetailDO customerreceiptRequestDetailDO : detailDOList) {
                 CustomerreceiptRecordDetailCreateReqVO customerreceiptRecordDetailCreateReqVO = new CustomerreceiptRecordDetailCreateReqVO();
                 BeanUtils.copyProperties(customerreceiptRequestDetailDO, customerreceiptRecordDetailCreateReqVO);
                 customerreceiptRecordDetailCreateReqVO.setNumber(number);
                 customerreceiptRecordDetailMapper.insert(CustomerreceiptRecordDetailConvert.INSTANCE.convert(customerreceiptRecordDetailCreateReqVO));
+                //添加库存事务list
+                TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
+                BeanUtils.copyProperties(customerreceiptRequestDetailDO, transactionCreateReqVO);
+                TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
+                transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
+                transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
+                transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
+                transactionCreateReqVO.setBusinessType(mainDO.getBusinessType());
+                transactionCreateReqVO.setOwnerCode(customerreceiptRequestDetailDO.getFromOwnerCode());
+                transactionCreateReqVO.setItemCode(customerreceiptRequestDetailDO.getItemCode());
+                transactionCreateReqVO.setRecordNumber(number);
+                transactionCreateReqVO.setId(null);
+                transactionCreateReqVO.setPackingNumber(customerreceiptRequestDetailDO.getPackingNumber());
+                transactionCreateReqVO.setBatch(customerreceiptRequestDetailDO.getBatch());
+                transactionCreateReqVO.setContainerNumber(customerreceiptRequestDetailDO.getContainerNumber());
+                transactionCreateReqVO.setAmount(BigDecimal.ZERO);
+                transactionCreateReqVO.setWarehouseCode(mainDO.getFromWarehouseCode());
+                transactionCreateReqVO.setLocationCode(customerreceiptRequestDetailDO.getFromLocationCode());
+                transactionCreateReqVOList.add(transactionCreateReqVO);
             }
+            transactionService.createTransaction(transactionCreateReqVOList);
             trendsApi.createTrends(mainDO.getId(), "CustomerReceiptRecord", "客户收货申请生成客户收货记录", TrendsTypeEnum.CREATE);
         }
     }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java

@@ -323,6 +323,7 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe
                     transactionCreateReqVO.setPackingNumber(customerreturnRecordDetailDO.getFromPackingNumber());
                     transactionCreateReqVO.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
                     transactionCreateReqVO.setId(null);
+                    transactionCreateReqVO.setAmount(BigDecimal.ZERO);
                     transactionCreateReqVOList.add(transactionCreateReqVO);
                 }
             });

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java

@@ -353,7 +353,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
         customerreturnJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
         customerreturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
         //增加业务类型
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectRequest");
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectJob");
         customerreturnJobMainDO.setBusinessType(businesstypeDO.getCode());
         customerreturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
         customerreturnJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
@@ -613,8 +613,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
         if (!"".equals(detailDo.getFromLocationCode())) {
             validatorIfInToLocationType(detailDo.getFromLocationCode(), businesstypeDO);
         }
+        detailDo.setToLocationCode("HOLD");
         //校验到库位
-//        customerdockService.
         validatorIfInFromLocationType(detailDo.getToLocationCode(), businesstypeDO);
         //校验库存状态
         validatorIfInventoryStatuses(detailDo.getInventoryStatus(), businesstypeDO);
@@ -782,7 +782,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque
         list.add(detailDO.getInventoryStatus());
         if ("CUST".equals(detailDO.getFromLocationCode())) {
             List<BalanceDO> balance = jobUtils.selectlocationReturnManagementAccuracy(detailDO.getItemCode(), detailDO.getPackingNumber()
-                    , detailDO.getBatch(), detailDO.getFromLocationCode(), list);
+                    , detailDO.getBatch(), detailDO.getToLocationCode(), list);
             isqty(detailDO.getQty(), balance.get(0).getQty());
         }
     }

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

@@ -37,6 +37,7 @@ import com.win.module.wms.enums.request.RequestStatusState;
 import com.win.module.wms.service.customersettleRecord.CustomersettleRecordMainService;
 import com.win.module.wms.service.deliverRecord.DeliverRecordMainService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
+import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -74,7 +75,8 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
     private CustomersettleRecordMainMapper customersettleRecordMainMapper;
     @Resource
     private CustomersettleRecordDetailMapper customersettleRecordDetailMapper;
-
+    @Resource
+    private TransactionService transactionService;
     @Resource
     private CustomersettleRecordMainService customersettleRecordMainService;
 
@@ -100,7 +102,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
         if(RequestStatusEnum.HANDLING.getCode().equals(customersettleRequestMainDO.getStatus())) {
             generateRecord(customersettleRequestMainDO,customersettleRequestDetailMapper.selectList(customersettleRequestMainDO.getId()));
         }
-        trendsApi.createTrends(customersettleRequestMainDO.getId(), "CustomerSettleRequest", "增加了客户结算申请", TrendsTypeEnum.CREATE);
+        trendsApi.createTrends(customersettleRequestMainDO.getId(), "CustomerSettle", "增加了客户结算申请", TrendsTypeEnum.CREATE);
         // 返回
         return customersettleRequestMainDO.getId();
     }
@@ -114,7 +116,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
         if(RequestStatusEnum.HANDLING.getCode().equals(updateObj.getStatus())) {
             generateRecord(updateObj,customersettleRequestDetailMapper.selectList(updateObj.getId()));
         }
-        trendsApi.createTrends(updateObj.getId(), "CustomerSettleRequest", "修改了客户结算申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(updateObj.getId(), "CustomerSettle", "修改了客户结算申请", TrendsTypeEnum.UPDATE);
         customersettleRequestMainMapper.updateById(updateObj);
     }
 
@@ -167,7 +169,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
             throw new ServiceException(CUSTOMERSETTLE_REQUEST_CANNOT_CLOSE);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
-        trendsApi.createTrends(id, "customersettleRequest", "关闭了客户结算申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerSettle", "关闭了客户结算申请", TrendsTypeEnum.UPDATE);
         return customersettleRequestMainMapper.updateById(mainDO);
     }
 
@@ -183,7 +185,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
             throw new ServiceException(CUSTOMERSETTLE_REQUEST_CANNOT_RE_ADD);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
-        trendsApi.createTrends(id, "customersettleRequest", "打开了客户结算申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerSettle", "打开了客户结算申请", TrendsTypeEnum.UPDATE);
         return customersettleRequestMainMapper.updateById(mainDO);
     }
 
@@ -256,7 +258,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
             throw new ServiceException(CUSTOMERSETTLE_REQUEST_CANNOT_REFUSED);
         }
         mainDO.setStatus(requestStatusState.getState().getCode());
-        trendsApi.createTrends(id, "customersettleRequest", "审批拒绝了客户结算申请", TrendsTypeEnum.UPDATE);
+        trendsApi.createTrends(id, "CustomerSettle", "审批拒绝了客户结算申请", TrendsTypeEnum.UPDATE);
         return customersettleRequestMainMapper.updateById(mainDO);
     }
 
@@ -274,7 +276,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
         String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_SETTLE_RECORD.getCode());
         customersettleRecordMainCreateReqVO.setNumber(number);
         //增加业务类型
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerSettleRecord");
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerSettleRequest");
         customersettleRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
         CustomersettleRecordMainDO convert = CustomersettleRecordMainConvert.INSTANCE.convert(customersettleRecordMainCreateReqVO);
         customersettleRecordMainMapper.insert(convert);
@@ -306,6 +308,8 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
             transactionCreateReqVO.setLocationCode(recordDetailDO.getFromLocationCode());
             transactionCreateReqVOList.add(transactionCreateReqVO);
         }
+        //增加库存事务
+        transactionService.createTransaction(transactionCreateReqVOList);
         trendsApi.createTrends(mainDO.getId(), "CustomerSettleRecord", "客户结算申请生成客户结算记录", TrendsTypeEnum.CREATE);
     }
 
@@ -354,7 +358,7 @@ public class CustomersettleRequestMainServiceImpl implements CustomersettleReque
                 mainDO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord());
                 mainDO.setRequestTime(LocalDateTime.now());
                 customersettleRequestMainMapper.insert(mainDO);
-                trendsApi.createTrends(mainDO.getId(), "CustomerSettleRequest", "导入了客户结算申请", TrendsTypeEnum.CREATE);
+                trendsApi.createTrends(mainDO.getId(), "CustomerSettle", "导入了客户结算申请", TrendsTypeEnum.CREATE);
                 for (CustomersettleRequestDetailDO detailDO : subDOList) {
                     detailDO.setMasterId(mainDO.getId());
                     detailDO.setNumber(number);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java

@@ -501,6 +501,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService
         String number = serialNumberApi.generateCode(RuleCodeEnum.DELIVER_REQUEST.getCode());
         deliverRequestMainDO.setNumber(number);
         deliverRequestMainDO.setRequestTime(LocalDateTime.now());
+        deliverRequestMainDO.setId(null);
         deliverRequestMainMapper.insert(deliverRequestMainDO);
         for (DeliverRequestDetailDO deliverRequestDetailDO : subDOList) {
             deliverRequestDetailDO.setMasterId(deliverRequestMainDO.getId());