|
|
|
@ -2,16 +2,38 @@ package com.win.module.wms.service.deliverRecord; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.win.framework.common.pojo.CustomConditions; |
|
|
|
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.deliverRecord.vo.DeliverRecordMainCreateReqVO; |
|
|
|
import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; |
|
|
|
import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainPageReqVO; |
|
|
|
import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainUpdateReqVO; |
|
|
|
import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; |
|
|
|
import com.win.module.wms.convert.deliverRecord.DeliverRecordDetailConvert; |
|
|
|
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.deliverRecord.DeliverRecordDetailDO; |
|
|
|
import com.win.module.wms.dal.dataobject.location.LocationDO; |
|
|
|
import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; |
|
|
|
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.deliverRecord.DeliverRecordDetailMapper; |
|
|
|
import com.win.module.wms.service.location.LocationService; |
|
|
|
import com.win.module.wms.service.recordsetting.RecordsettingService; |
|
|
|
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 javax.annotation.Resource; |
|
|
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
|
|
|
|
|
import java.time.LocalDateTime; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO; |
|
|
|
@ -21,6 +43,7 @@ import com.win.module.wms.convert.deliverRecord.DeliverRecordMainConvert; |
|
|
|
import com.win.module.wms.dal.mysql.deliverRecord.DeliverRecordMainMapper; |
|
|
|
|
|
|
|
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.*; |
|
|
|
|
|
|
|
/** |
|
|
|
@ -34,15 +57,119 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { |
|
|
|
|
|
|
|
@Resource |
|
|
|
private DeliverRecordMainMapper deliverRecordMainMapper; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private DeliverRecordDetailMapper deliverRecordDetailMapper; |
|
|
|
@Resource |
|
|
|
private TransactionService transactionService; |
|
|
|
@Resource |
|
|
|
private BalanceMapper balanceMapper; |
|
|
|
@Resource |
|
|
|
private TrendsApi trendsApi; |
|
|
|
@Resource |
|
|
|
private JobUtils jobUtils; |
|
|
|
@Resource |
|
|
|
private SerialNumberApi serialNumberApi; |
|
|
|
@Resource |
|
|
|
private AdminUserApi userApi; |
|
|
|
@Resource |
|
|
|
private RecordsettingService recordsettingService; |
|
|
|
@Resource |
|
|
|
private LocationService locationService; |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional |
|
|
|
public Long createDeliverRecordMain(DeliverRecordMainCreateReqVO createReqVO) { |
|
|
|
// 插入
|
|
|
|
DeliverRecordMainDO deliverRecordMain = DeliverRecordMainConvert.INSTANCE.convert(createReqVO); |
|
|
|
deliverRecordMainMapper.insert(deliverRecordMain); |
|
|
|
DeliverRecordMainDO mainDO = DeliverRecordMainConvert.INSTANCE.convert(createReqVO); |
|
|
|
List<DeliverRecordDetailDO> subDOList = DeliverRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); |
|
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.DELIVER_RECORD.getCode()); |
|
|
|
mainDO.setNumber(number); |
|
|
|
mainDO.setExecuteTime(LocalDateTime.now()); |
|
|
|
mainDO.setActiveDate(LocalDateTime.now()); |
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("DeliverRecord"); |
|
|
|
mainDO.setBusinessType(businesstypeDO.getCode()); |
|
|
|
mainDO.setFromLocationTypes(businesstypeDO.getCode()); |
|
|
|
mainDO.setFromAreaCodes(businesstypeDO.getCode()); |
|
|
|
mainDO.setToLocationTypes(businesstypeDO.getCode()); |
|
|
|
mainDO.setToAreaCodes(businesstypeDO.getCode()); |
|
|
|
mainDO.setOutTransactionType(businesstypeDO.getOutTransactionType()); |
|
|
|
mainDO.setInTransactionType(businesstypeDO.getInTransactionType()); |
|
|
|
RecordsettingDO recordsettingDO = recordsettingService.selectRecordsettingExist("DeliverRecord"); |
|
|
|
mainDO.setInterfaceType(recordsettingDO.getInterfaceType()); |
|
|
|
//由PDA给值进行赋值
|
|
|
|
mainDO.setCustomerDeliverNumber(deliverRecordMain.getCustomerDeliverNumber()); |
|
|
|
mainDO.setCarrierCode(deliverRecordMain.getCarrierCode()); |
|
|
|
mainDO.setTransferMode(deliverRecordMain.getTransferMode()); |
|
|
|
mainDO.setVehiclePlateNumber(deliverRecordMain.getVehiclePlateNumber()); |
|
|
|
mainDO.setFromWarehouseCode(deliverRecordMain.getFromWarehouseCode()); |
|
|
|
mainDO.setToWarehouseCode(deliverRecordMain.getToWarehouseCode()); |
|
|
|
mainDO.setAvailable("TRUE"); |
|
|
|
deliverRecordMainMapper.insert(mainDO); |
|
|
|
//库存事务
|
|
|
|
List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>(); |
|
|
|
Long userId = getLoginUserId(); |
|
|
|
AdminUserRespDTO userRespDTO = userApi.getUser(userId); |
|
|
|
for (DeliverRecordDetailDO detailDO : subDOList) { |
|
|
|
detailDO.setMasterId(mainDO.getId().toString()); |
|
|
|
detailDO.setNumber(number); |
|
|
|
//由PDA给值进行赋值
|
|
|
|
LocationDO fromLocationDO = locationService.selectLocation(detailDO.getFromLocationCode()); |
|
|
|
detailDO.setFromLocationGroupCode(fromLocationDO.getLocationGroupCode()); |
|
|
|
detailDO.setFromAreaCode(fromLocationDO.getAreaCode()); |
|
|
|
LocationDO toLocationDO = locationService.selectLocation(detailDO.getToLocationCode()); |
|
|
|
detailDO.setToLocationGroupCode(toLocationDO.getLocationGroupCode()); |
|
|
|
detailDO.setToAreaCode(toLocationDO.getAreaCode()); |
|
|
|
detailDO.setInterfaceType(mainDO.getInterfaceType()); |
|
|
|
detailDO.setAvailable("TRUE"); |
|
|
|
//添加库存事务入list
|
|
|
|
TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); |
|
|
|
BeanUtils.copyProperties(detailDO, 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.getBatch()); |
|
|
|
transactionCreateReqVOOut.setPackingNumber(detailDO.getPackingNumber()); |
|
|
|
transactionCreateReqVOOut.setLocationCode(detailDO.getFromLocationCode()); |
|
|
|
transactionCreateReqVOOut.setSinglePrice(detailDO.getSinglePrice()); |
|
|
|
transactionCreateReqVOOut.setAmount(detailDO.getAmount()); |
|
|
|
transactionCreateReqVOOut.setWarehouseCode(mainDO.getFromWarehouseCode()); |
|
|
|
transactionCreateReqVOOut.setId(null); |
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVOOut); |
|
|
|
//判断businesstypeDO.getInTransactionType()是否为空，不为空时增加入库存事务
|
|
|
|
if(businesstypeDO.getInTransactionType() != null && !businesstypeDO.getInTransactionType().isEmpty()) { |
|
|
|
//增加业务入类型
|
|
|
|
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.getBatch()); |
|
|
|
transactionCreateReqVOIn.setPackingNumber(detailDO.getPackingNumber()); |
|
|
|
transactionCreateReqVOIn.setInventoryStatus(detailDO.getInventoryStatus()); |
|
|
|
transactionCreateReqVOIn.setLocationCode(detailDO.getToLocationCode()); |
|
|
|
transactionCreateReqVOIn.setSinglePrice(detailDO.getSinglePrice()); |
|
|
|
transactionCreateReqVOIn.setAmount(detailDO.getAmount()); |
|
|
|
transactionCreateReqVOIn.setWarehouseCode(mainDO.getToWarehouseCode()); |
|
|
|
transactionCreateReqVOIn.setRecordNumber(number); |
|
|
|
transactionCreateReqVOIn.setId(null); |
|
|
|
//待确定库存事务信息
|
|
|
|
transactionCreateReqVOList.add(transactionCreateReqVOIn); |
|
|
|
} |
|
|
|
} |
|
|
|
deliverRecordDetailMapper.insertBatch(subDOList); |
|
|
|
//增加库存事务
|
|
|
|
transactionService.createTransaction(transactionCreateReqVOList); |
|
|
|
//增加操作记录
|
|
|
|
trendsApi.createTrends(mainDO.getId(), "deliverRecordMain", "增加了发货记录", TrendsTypeEnum.CREATE); |
|
|
|
// 返回
|
|
|
|
return deliverRecordMain.getId(); |
|
|
|
} |
|
|
|
|
