diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java index 54172d64..fb07622b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.inventorychangeRequest; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; @@ -274,25 +275,50 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode()); String outTransactionType = businesstypeDO.getOutTransactionType(); if(outTransactionType != null && !"".equals(outTransactionType)){ - TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); + TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(outTransactionType); transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction()); transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode()); transactionCreateReqVOOut.setRecordNumber(number); - transactionCreateReqVOOut.setInventoryStatus(inventorychangeRequestDetailDO.getToInventoryStatus()); + transactionCreateReqVOOut.setInventoryStatus(inventorychangeRequestDetailDO.getFromInventoryStatus()); transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId())); - transactionCreateReqVOOut.setBatch(inventorychangeRequestDetailDO.getToBatch()); - transactionCreateReqVOOut.setPackingNumber(inventorychangeRequestDetailDO.getToPackingNumber()); + transactionCreateReqVOOut.setBatch(inventorychangeRequestDetailDO.getFromBatch()); + transactionCreateReqVOOut.setPackingNumber(inventorychangeRequestDetailDO.getFromPackingNumber()); transactionCreateReqVOOut.setLocationCode(inventorychangeRequestDetailDO.getLocationCode()); transactionCreateReqVOOut.setSinglePrice(BigDecimal.ZERO); transactionCreateReqVOOut.setAmount(BigDecimal.ZERO); - transactionCreateReqVOOut.setQty(inventorychangeRequestDetailDO.getFromQty().subtract(inventorychangeRequestDetailDO.getToQty())); - transactionCreateReqVOOut.setArriveDate(inventorychangeRequestDetailDO.getToArrivdAte()); - transactionCreateReqVOOut.setProduceDate(inventorychangeRequestDetailDO.getToProduceDate()); - transactionCreateReqVOOut.setExpireDate(inventorychangeRequestDetailDO.getToExpireDate()); + transactionCreateReqVOOut.setQty(inventorychangeRequestDetailDO.getToQty()); + transactionCreateReqVOOut.setArriveDate(inventorychangeRequestDetailDO.getFromArriveDate()); + transactionCreateReqVOOut.setProduceDate(inventorychangeRequestDetailDO.getFromProduceDate()); + transactionCreateReqVOOut.setExpireDate(inventorychangeRequestDetailDO.getFromExpireDate()); transactionCreateReqVOOut.setWarehouseCode(mainDO.getWarehouseCode()); transactionCreateReqVOOut.setId(null); transactionCreateReqVOList.add(transactionCreateReqVOOut); } + // 库存事务——入 + TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); + BeanUtils.copyProperties(inventorychangeRequestDetailDO, transactionCreateReqVOIn); + transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); + String inTransactionType = businesstypeDO.getInTransactionType(); + if(inTransactionType != null && !"".equals(inTransactionType)){ + TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(inTransactionType); + transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); + transactionCreateReqVOIn.setTransactionType(transactiontypeDOIn.getCode()); + transactionCreateReqVOIn.setRecordNumber(number); + transactionCreateReqVOIn.setInventoryStatus(inventorychangeRequestDetailDO.getToInventoryStatus()); + transactionCreateReqVOIn.setWorker(String.valueOf(userRespDTO.getId())); + transactionCreateReqVOIn.setBatch(inventorychangeRequestDetailDO.getToBatch()); + transactionCreateReqVOIn.setPackingNumber(inventorychangeRequestDetailDO.getToPackingNumber()); + transactionCreateReqVOIn.setLocationCode(inventorychangeRequestDetailDO.getLocationCode()); + transactionCreateReqVOIn.setSinglePrice(BigDecimal.ZERO); + transactionCreateReqVOIn.setAmount(BigDecimal.ZERO); + transactionCreateReqVOIn.setQty(inventorychangeRequestDetailDO.getToQty()); + transactionCreateReqVOIn.setArriveDate(inventorychangeRequestDetailDO.getToArrivdAte()); + transactionCreateReqVOIn.setProduceDate(inventorychangeRequestDetailDO.getToProduceDate()); + transactionCreateReqVOIn.setExpireDate(inventorychangeRequestDetailDO.getToExpireDate()); + transactionCreateReqVOIn.setWarehouseCode(mainDO.getWarehouseCode()); + transactionCreateReqVOIn.setId(null); + transactionCreateReqVOList.add(transactionCreateReqVOIn); + } } inventorychangeRecordDetailMapper.insertBatch(iinventorychangeRecordDetailCreateReqVOlDOList); //增加库存事务