上架直接生成记录接口。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java

@@ -48,13 +48,6 @@ public class CountRecordMainController {
     @Resource
     private AdminUserApi userApi;
 
-    @PostMapping("/create")
-    @Operation(summary = "创建盘点记录")
-    @PreAuthorize("@ss.hasPermission('wms:count-record-main:create')")
-    public CommonResult<Long> createCountRecordMain(@Valid @RequestBody CountRecordMainCreateReqVO createReqVO) {
-        return success(countRecordMainService.createCountRecordMain(createReqVO));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得盘点记录主分页")
     @PreAuthorize("@ss.hasPermission('wms:count-record-main:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java

@@ -216,7 +216,7 @@ public class CountRequestMainController {
     }
 
     @PutMapping("/handle")
-    @Operation(summary = "执行盘点申请主")
+    @Operation(summary = "处理盘点申请主")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:count-request-main:handle')")
     public CommonResult<Boolean> handleCountRequestMain(@RequestParam("id") Long id) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java

@@ -147,7 +147,7 @@ public class CountadjustRequestMainController {
     }
 
     @PutMapping("/handle")
-    @Operation(summary = "执行盘点调整申请主")
+    @Operation(summary = "处理盘点调整申请主")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:handle')")
     public CommonResult<Boolean> handleCountadjustRequestMain(@RequestParam("id") Long id) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java

@@ -47,13 +47,6 @@ public class InspectRecordMainController {
     @Resource
     private AdminUserApi userApi;
 
-    @PostMapping("/create")
-    @Operation(summary = "创建检验记录")
-    @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:create')")
-    public CommonResult<Long> createInspectRecordMain(@Valid @RequestBody InspectRecordMainCreateReqVO createReqVO) {
-        return success(inspectRecordMainService.createInspectRecordMain(createReqVO));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得检验记录主分页")
     @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainService.java

@@ -2,7 +2,6 @@ package com.win.module.wms.service.countRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.controller.countRecord.vo.CountRecordMainCreateReqVO;
 import com.win.module.wms.controller.countRecord.vo.CountRecordMainExportReqVO;
 import com.win.module.wms.controller.countRecord.vo.CountRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO;
@@ -16,13 +15,6 @@ import java.util.List;
  */
 public interface CountRecordMainService {
 
-    /**
-     * 创建盘点记录
-     * @param createReqVO 盘点记录主
-     * @return id
-     */
-    Long createCountRecordMain(CountRecordMainCreateReqVO createReqVO);
-
     /**
      * 获得盘点记录主分页
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRecord/CountRecordMainServiceImpl.java

@@ -7,12 +7,8 @@ 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.enums.serialNumber.RuleCodeEnum;
-import com.win.module.wms.controller.countRecord.vo.CountRecordMainCreateReqVO;
 import com.win.module.wms.controller.countRecord.vo.CountRecordMainExportReqVO;
 import com.win.module.wms.controller.countRecord.vo.CountRecordMainPageReqVO;
-import com.win.module.wms.convert.countRecord.CountRecordDetailConvert;
-import com.win.module.wms.convert.countRecord.CountRecordMainConvert;
-import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO;
 import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO;
@@ -27,7 +23,6 @@ import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -62,29 +57,6 @@ public class CountRecordMainServiceImpl implements CountRecordMainService {
     @Resource
     private JobUtils jobUtils;
 
-    @Override
-    @Transactional
-    public Long createCountRecordMain(CountRecordMainCreateReqVO createReqVO) {
-        CountRecordMainDO mainDO = CountRecordMainConvert.INSTANCE.convert(createReqVO);
-        List<CountRecordDetailDO> subDOList = CountRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
-        String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_RECORD.getCode());
-        mainDO.setNumber(number);
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord");
-        mainDO.setBusinessType(businesstypeDO.getCode());
-        countRecordMainMapper.insert(mainDO);
-        for (int i = 0; i < subDOList.size(); i++) {
-            CountRecordDetailDO detailDO = subDOList.get(i);
-            detailDO.setMasterId(mainDO.getId());
-            detailDO.setNumber(number);
-            detailDO.setCountDetailNumber(String.valueOf(i+1));
-        }
-        countRecordDetailMapper.insertBatch(subDOList);
-        //增加操作记录
-        trendsApi.createTrends(mainDO.getId(), "countRecordMain", "增加了盘点记录", TrendsTypeEnum.CREATE);
-        // 返回
-        return mainDO.getId();
-    }
-
     @Override
     public PageResult<CountRecordMainDO> getCountRecordMainPage(CountRecordMainPageReqVO pageReqVO) {
         return countRecordMainMapper.selectPage(pageReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java

@@ -2,7 +2,6 @@ package com.win.module.wms.service.inspectRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
@@ -16,13 +15,6 @@ import java.util.List;
  */
 public interface InspectRecordMainService {
 
-    /**
-     * 创建检验记录
-     * @param createReqVO 检验记录主
-     * @return id
-     */
-    Long createInspectRecordMain(InspectRecordMainCreateReqVO createReqVO);
-
     /**
      * 获得检验记录主分页
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java

@@ -44,27 +44,6 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService {
     @Resource
     private SerialNumberApi serialNumberApi;
 
-    @Override
-    @Transactional
-    public Long createInspectRecordMain(InspectRecordMainCreateReqVO createReqVO) {
-        InspectRecordMainDO mainDO = InspectRecordMainConvert.INSTANCE.convert(createReqVO);
-        List<InspectRecordDetailDO> subDOList = InspectRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
-        String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_RECORD.getCode());
-        mainDO.setNumber(number);
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord");
-        mainDO.setBusinessType(businesstypeDO.getCode());
-        inspectRecordMainMapper.insert(mainDO);
-        for (InspectRecordDetailDO detailDO : subDOList) {
-            detailDO.setMasterId(mainDO.getId());
-            detailDO.setNumber(number);
-        }
-        inspectRecordDetailMapper.insertBatch(subDOList);
-        //增加操作记录
-        trendsApi.createTrends(mainDO.getId(), "inspectRecordMain", "增加了检验记录", TrendsTypeEnum.CREATE);
-        // 返回
-        return mainDO.getId();
-    }
-
     @Override
     public PageResult<InspectRecordMainDO> getInspectRecordMainPage(InspectRecordMainPageReqVO pageReqVO) {
         return inspectRecordMainMapper.selectPage(pageReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java

@@ -5,25 +5,36 @@ 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.api.user.dto.AdminUserRespDTO;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO;
 import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO;
 import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO;
+import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.convert.putawayRecord.PutawayRecordDetailConvert;
 import com.win.module.wms.convert.putawayRecord.PutawayRecordMainConvert;
+import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO;
 import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO;
+import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
+import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordDetailMapper;
 import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper;
+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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
+import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
 /**
  * 上架记录主 Service 实现类
  *
@@ -38,11 +49,17 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService {
     @Resource
     private PutawayRecordDetailMapper putawayRecordDetailMapper;
     @Resource
+    private TransactionService transactionService;
+    @Resource
+    private BalanceMapper balanceMapper;
+    @Resource
     private TrendsApi trendsApi;
     @Resource
     private JobUtils jobUtils;
     @Resource
     private SerialNumberApi serialNumberApi;
+    @Resource
+    private AdminUserApi userApi;
 
     @Override
     @Transactional
@@ -54,11 +71,65 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService {
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PutawayRecord");
         mainDO.setBusinessType(businesstypeDO.getCode());
         putawayRecordMainMapper.insert(mainDO);
+        //库存事务
+        List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
+        Long userId = getLoginUserId();
+        AdminUserRespDTO userRespDTO = userApi.getUser(userId);
         for (PutawayRecordDetailDO detailDO : subDOList) {
             detailDO.setMasterId(mainDO.getId());
             detailDO.setNumber(number);
+            //添加库存事务入list
+            TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO();
+            BeanUtils.copyProperties(detailDO, transactionCreateReqVOIn);
+            //查询库存余额
+            BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode());
+            //增加业务入类型
+            transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode());
+            TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
+            transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction());
+            transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode());
+            transactionCreateReqVOIn.setWorker(String.valueOf(userRespDTO.getId()));
+            transactionCreateReqVOIn.setBatch(detailDO.getToBatch());
+            transactionCreateReqVOIn.setPackingNumber(detailDO.getToPackingNumber());
+            transactionCreateReqVOIn.setInventoryStatus(balanceDO.getInventoryStatus());
+            transactionCreateReqVOIn.setLocationCode(detailDO.getToLocationCode());
+            transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice());
+            transactionCreateReqVOIn.setAmount(balanceDO.getAmount());
+            transactionCreateReqVOIn.setArriveDate(balanceDO.getArriveDate());
+            transactionCreateReqVOIn.setProduceDate(balanceDO.getProduceDate());
+            transactionCreateReqVOIn.setExpireDate(balanceDO.getExpireDate());
+            transactionCreateReqVOIn.setWarehouseCode(mainDO.getFromWarehouseCode());
+            transactionCreateReqVOIn.setRecordNumber(number);
+            transactionCreateReqVOIn.setId(null);
+            //待确定库存事务信息
+            transactionCreateReqVOList.add(transactionCreateReqVOIn);
+            //添加库存事务出list
+            TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO();
+            BeanUtils.copyProperties(detailDO, transactionCreateReqVOOut);
+            //增加业务出类型
+            transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode());
+            TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
+            transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
+            transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
+            transactionCreateReqVOOut.setRecordNumber(number);
+            transactionCreateReqVOOut.setInventoryStatus(detailDO.getInventoryStatus());
+            transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId()));
+            transactionCreateReqVOOut.setBatch(detailDO.getFromBatch());
+            transactionCreateReqVOOut.setPackingNumber(detailDO.getFromPackingNumber());
+            transactionCreateReqVOOut.setLocationCode(detailDO.getFromLocationCode());
+            transactionCreateReqVOOut.setSinglePrice(balanceDO.getSinglePrice());
+            transactionCreateReqVOOut.setAmount(balanceDO.getAmount());
+            transactionCreateReqVOOut.setArriveDate(balanceDO.getArriveDate());
+            transactionCreateReqVOOut.setProduceDate(balanceDO.getProduceDate());
+            transactionCreateReqVOOut.setExpireDate(balanceDO.getExpireDate());
+            transactionCreateReqVOOut.setWarehouseCode(mainDO.getFromWarehouseCode());
+            transactionCreateReqVOOut.setId(null);
+            //待确定库存事务信息
+            transactionCreateReqVOList.add(transactionCreateReqVOOut);
         }
         putawayRecordDetailMapper.insertBatch(subDOList);
+        //增加库存事务
+        transactionService.createTransaction(transactionCreateReqVOList);
         //增加操作记录
         trendsApi.createTrends(mainDO.getId(), "putawayRecordMain", "增加了检验记录", TrendsTypeEnum.CREATE);
         // 返回