zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复bug

master
chenfang 2 years ago
parent
f33d29f9f1
commit
0338bf2d11
1 changed files with 34 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java

42
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.win.module.wms.service.inventorychangeRequest; package com.win.module.wms.service.inventorychangeRequest;
import cn.hutool.core.collection.CollUtil; 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.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.PageResult;
@ -274,25 +275,50 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq
transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode()); transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode());
String outTransactionType = businesstypeDO.getOutTransactionType(); String outTransactionType = businesstypeDO.getOutTransactionType();
if(outTransactionType != null && !"".equals(outTransactionType)){ if(outTransactionType != null && !"".equals(outTransactionType)){
TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(outTransactionType);
transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction()); transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode()); transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
transactionCreateReqVOOut.setRecordNumber(number); transactionCreateReqVOOut.setRecordNumber(number);
transactionCreateReqVOOut.setInventoryStatus(inventorychangeRequestDetailDO.getToInventoryStatus()); transactionCreateReqVOOut.setInventoryStatus(inventorychangeRequestDetailDO.getFromInventoryStatus());
transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId())); transactionCreateReqVOOut.setWorker(String.valueOf(userRespDTO.getId()));
transactionCreateReqVOOut.setBatch(inventorychangeRequestDetailDO.getToBatch()); transactionCreateReqVOOut.setBatch(inventorychangeRequestDetailDO.getFromBatch());
transactionCreateReqVOOut.setPackingNumber(inventorychangeRequestDetailDO.getToPackingNumber()); transactionCreateReqVOOut.setPackingNumber(inventorychangeRequestDetailDO.getFromPackingNumber());
transactionCreateReqVOOut.setLocationCode(inventorychangeRequestDetailDO.getLocationCode()); transactionCreateReqVOOut.setLocationCode(inventorychangeRequestDetailDO.getLocationCode());
transactionCreateReqVOOut.setSinglePrice(BigDecimal.ZERO); transactionCreateReqVOOut.setSinglePrice(BigDecimal.ZERO);
transactionCreateReqVOOut.setAmount(BigDecimal.ZERO); transactionCreateReqVOOut.setAmount(BigDecimal.ZERO);
transactionCreateReqVOOut.setQty(inventorychangeRequestDetailDO.getFromQty().subtract(inventorychangeRequestDetailDO.getToQty())); transactionCreateReqVOOut.setQty(inventorychangeRequestDetailDO.getToQty());
transactionCreateReqVOOut.setArriveDate(inventorychangeRequestDetailDO.getToArrivdAte()); transactionCreateReqVOOut.setArriveDate(inventorychangeRequestDetailDO.getFromArriveDate());
transactionCreateReqVOOut.setProduceDate(inventorychangeRequestDetailDO.getToProduceDate()); transactionCreateReqVOOut.setProduceDate(inventorychangeRequestDetailDO.getFromProduceDate());
transactionCreateReqVOOut.setExpireDate(inventorychangeRequestDetailDO.getToExpireDate()); transactionCreateReqVOOut.setExpireDate(inventorychangeRequestDetailDO.getFromExpireDate());
transactionCreateReqVOOut.setWarehouseCode(mainDO.getWarehouseCode()); transactionCreateReqVOOut.setWarehouseCode(mainDO.getWarehouseCode());
transactionCreateReqVOOut.setId(null); transactionCreateReqVOOut.setId(null);
transactionCreateReqVOList.add(transactionCreateReqVOOut); 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); inventorychangeRecordDetailMapper.insertBatch(iinventorychangeRecordDetailCreateReqVOlDOList);
//增加库存事务 //增加库存事务

Write Preview
Loading…
Cancel
Save