单据类型转换，耗材字典新增问题
anthonywj
2 years ago
parent
f14e4c2b78
commit
fbcc23540d
@ -0,0 +1,233 @@
|
|||||||
|
package com.glxp.api.service.inout;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollUtil;
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import com.glxp.api.constant.Constant;
|
||||||
|
import com.glxp.api.constant.ConstantStatus;
|
||||||
|
import com.glxp.api.constant.ConstantType;
|
||||||
|
import com.glxp.api.entity.auth.InvWarehouseEntity;
|
||||||
|
import com.glxp.api.entity.basic.BasicBusTypePreEntity;
|
||||||
|
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
|
||||||
|
import com.glxp.api.entity.inout.IoCodeEntity;
|
||||||
|
import com.glxp.api.entity.inout.IoCodeTempEntity;
|
||||||
|
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||||
|
import com.glxp.api.entity.inv.InvProductDetailEntity;
|
||||||
|
import com.glxp.api.entity.system.SystemParamConfigEntity;
|
||||||
|
import com.glxp.api.service.auth.InvWarehouseService;
|
||||||
|
import com.glxp.api.service.basic.IBasicBusTypePreService;
|
||||||
|
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
||||||
|
import com.glxp.api.service.inv.InvProductDetailService;
|
||||||
|
import com.glxp.api.service.inv.InvProductService;
|
||||||
|
import com.glxp.api.service.system.SystemParamConfigService;
|
||||||
|
import com.glxp.api.util.CustomUtil;
|
||||||
|
import com.glxp.api.util.DateUtil;
|
||||||
|
import com.glxp.api.util.GennerOrderUtils;
|
||||||
|
import com.glxp.api.util.OrderNoTypeBean;
|
||||||
|
import org.springframework.beans.BeanUtils;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单据流转
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class IoChangeInoutService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
IBasicBusTypePreService basicBusTypePreService;
|
||||||
|
@Resource
|
||||||
|
IoCodeService codeService;
|
||||||
|
@Resource
|
||||||
|
IoOrderService orderService;
|
||||||
|
@Resource
|
||||||
|
InvProductDetailService invProductDetailService;
|
||||||
|
@Resource
|
||||||
|
IBasicBussinessTypeService basicBussinessTypeService;
|
||||||
|
@Resource
|
||||||
|
GennerOrderUtils gennerOrderUtils;
|
||||||
|
@Resource
|
||||||
|
IoAddInoutService addInoutService;
|
||||||
|
@Resource
|
||||||
|
IoCheckInoutService ioCheckInoutService;
|
||||||
|
@Resource
|
||||||
|
InvWarehouseService invWarehouseService;
|
||||||
|
@Resource
|
||||||
|
SystemParamConfigService systemParamConfigService;
|
||||||
|
@Resource
|
||||||
|
IoCodeTempService codeTempService;
|
||||||
|
|
||||||
|
public void changeOrder(IoOrderEntity orderEntity) {
|
||||||
|
|
||||||
|
BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction());
|
||||||
|
List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderEntity.getBillNo());
|
||||||
|
buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//后续做修改
|
||||||
|
public void changeBusOrder(IoOrderEntity orderEntity) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//普通出入库单据流转
|
||||||
|
public void genNewOrder(IoOrderEntity orderEntity, List<InvProductDetailEntity> invProductDetailEntities) {
|
||||||
|
|
||||||
|
BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction());
|
||||||
|
List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderEntity.getBillNo());
|
||||||
|
if (basicBusTypePreEntity.getSupplementAll()) {//全量补单
|
||||||
|
invProductDetailService.insertList(invProductDetailEntities);
|
||||||
|
buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity);
|
||||||
|
} else { //缺量补单
|
||||||
|
List<IoCodeEntity> inList = new ArrayList<>();
|
||||||
|
for (IoCodeEntity warehouseEntity : codeEnttities) {
|
||||||
|
Integer invCount = getInvCount(warehouseEntity);
|
||||||
|
Integer count = warehouseEntity.getMyReCount();
|
||||||
|
if (invCount > 0) {//仓库已存在该产品
|
||||||
|
if (count > invCount) { //当前数量>结余数量，说明该产品是无序列号或者是多级包装
|
||||||
|
if (count > invCount) { //该产品实际数量大于结余数量，说明是多级包装，直接补
|
||||||
|
inList.add(warehouseEntity);
|
||||||
|
} else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量
|
||||||
|
int lea = count - invCount;
|
||||||
|
warehouseEntity.setCount(lea / (count)); //
|
||||||
|
inList.add(warehouseEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else { //结余数量《=0直接补
|
||||||
|
inList.add(warehouseEntity);
|
||||||
|
}
|
||||||
|
InvProductDetailEntity invProductDetailEntity = filterInvByCode(invProductDetailEntities, warehouseEntity.getCode());
|
||||||
|
invProductDetailService.insert(invProductDetailEntity);
|
||||||
|
}
|
||||||
|
buildInOrder(basicBusTypePreEntity, inList, orderEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public InvProductDetailEntity filterInvByCode(List<InvProductDetailEntity> invProductDetailEntities, String
|
||||||
|
code) {
|
||||||
|
for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
|
||||||
|
if (invProductDetailEntity.getCode().equals(code)) {
|
||||||
|
return invProductDetailEntity;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
//计算当前库存数量
|
||||||
|
public int getInvCount(IoCodeEntity codeEntity) {
|
||||||
|
|
||||||
|
List<InvProductDetailEntity> resultLists = invProductDetailService.selectByUnique(codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getSupId(), codeEntity.getDeptCode(), codeEntity.getInvCode());
|
||||||
|
int invCount = 0;
|
||||||
|
if (CollUtil.isNotEmpty(resultLists)) {
|
||||||
|
for (InvProductDetailEntity invProductDetailEntity : resultLists) {
|
||||||
|
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
|
||||||
|
invCount = invCount - invProductDetailEntity.getReCount();
|
||||||
|
} else {
|
||||||
|
invCount = invCount + invProductDetailEntity.getReCount();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return invCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
//生成单据
|
||||||
|
public void buildInOrder(BasicBusTypePreEntity bussinessChangeTypeEntity, List<IoCodeEntity> useInList, IoOrderEntity orderEntity) {
|
||||||
|
if (useInList.size() <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Map<String, List<IoCodeEntity>> filterSupMaps = new HashMap<>();
|
||||||
|
BasicBussinessTypeEntity targetBustypeEntity = basicBussinessTypeService.findByAction(bussinessChangeTypeEntity.getAction());
|
||||||
|
//过滤供应商
|
||||||
|
if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
|
||||||
|
for (IoCodeEntity warehouseEntity : useInList) {
|
||||||
|
if (warehouseEntity.getSupId() != null) {
|
||||||
|
if (filterSupMaps.get(warehouseEntity.getSupId()) == null) {
|
||||||
|
List<IoCodeEntity> temps = new ArrayList<>();
|
||||||
|
temps.add(warehouseEntity);
|
||||||
|
filterSupMaps.put(warehouseEntity.getSupId(), temps);
|
||||||
|
} else {
|
||||||
|
filterSupMaps.get(warehouseEntity.getSupId()).add(warehouseEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
filterSupMaps.put(bussinessChangeTypeEntity.getDefaultInvCode(), useInList);
|
||||||
|
}
|
||||||
|
//根据往来单位生成入库单
|
||||||
|
for (String corpName : filterSupMaps.keySet()) {
|
||||||
|
List<IoCodeEntity> temps;
|
||||||
|
temps = filterSupMaps.get(corpName);
|
||||||
|
IoOrderEntity outOrder = new IoOrderEntity();
|
||||||
|
BeanUtils.copyProperties(orderEntity, outOrder);
|
||||||
|
outOrder.setId(null);
|
||||||
|
outOrder.setSupplementNo(null);//补单需置空
|
||||||
|
if (bussinessChangeTypeEntity.getBeforeTime() != null)
|
||||||
|
outOrder.setCreateTime(DateUtil.getBeforeDay(DateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
|
||||||
|
else
|
||||||
|
outOrder.setCreateTime(DateUtil.fromDate(orderEntity));
|
||||||
|
outOrder.setAction(targetBustypeEntity.getAction());
|
||||||
|
outOrder.setMainAction(targetBustypeEntity.getMainAction());
|
||||||
|
outOrder.setBusType(targetBustypeEntity.getBusType());
|
||||||
|
outOrder.setFromType(ConstantStatus.FROM_CHANGE);
|
||||||
|
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(targetBustypeEntity.getPrefix()), "yyyyMMdd"));
|
||||||
|
outOrder.setBillNo(orderNo);
|
||||||
|
|
||||||
|
if (targetBustypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
|
||||||
|
outOrder.setCustomerId(corpName);
|
||||||
|
outOrder.setFromCorp(corpName);
|
||||||
|
outOrder.setFromInvCode(null);
|
||||||
|
outOrder.setFromDeptCode(null);
|
||||||
|
} else {
|
||||||
|
outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
|
||||||
|
outOrder.setFromInvCode(bussinessChangeTypeEntity.getDefaultInvCode());
|
||||||
|
outOrder.setFromDeptCode(bussinessChangeTypeEntity.getDefaultDeptCode());
|
||||||
|
outOrder.setFromCorp(null);
|
||||||
|
}
|
||||||
|
outOrder.setCorpOrderId(CustomUtil.getId() + "x");
|
||||||
|
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getInvCode());
|
||||||
|
outOrder.setInvCode(invWarehouseEntity.getCode());
|
||||||
|
outOrder.setDeptCode(invWarehouseEntity.getParentId());
|
||||||
|
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit");
|
||||||
|
if ("1".equals(systemParamConfigEntity.getParamValue())) {
|
||||||
|
outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
|
||||||
|
} else {
|
||||||
|
outOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
//互填单号
|
||||||
|
orderEntity.setUllageSupNo(outOrder.getBillNo());
|
||||||
|
orderEntity.setUpdateTime(new Date());
|
||||||
|
orderService.update(orderEntity);
|
||||||
|
outOrder.setOriginUllageSupNo(orderEntity.getBillNo());
|
||||||
|
outOrder.setCreateUser(null);
|
||||||
|
outOrder.setReviewUser(null);
|
||||||
|
orderService.insertOrder(outOrder);
|
||||||
|
List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
|
||||||
|
for (IoCodeEntity warehouseEntity : temps) {
|
||||||
|
IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
|
||||||
|
BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
|
||||||
|
codeTempEntity.setId(null);
|
||||||
|
codeTempEntity.setOrderId(outOrder.getBillNo());
|
||||||
|
codeTempEntity.setAction(outOrder.getAction());
|
||||||
|
codeTempEntity.setMainAction(outOrder.getMainAction());
|
||||||
|
codeTempEntities.add(codeTempEntity);
|
||||||
|
}
|
||||||
|
codeTempService.insertBatch(codeTempEntities);
|
||||||
|
|
||||||
|
//根据单据设置状态 1:草稿
|
||||||
|
if (bussinessChangeTypeEntity.getAuditStatus() == 1) {
|
||||||
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
|
||||||
|
orderService.update(orderEntity);
|
||||||
|
} else if (bussinessChangeTypeEntity.getAuditStatus() == 2 || bussinessChangeTypeEntity.getAuditStatus() == 3) {
|
||||||
|
addInoutService.dealProcess(outOrder);
|
||||||
|
if (!ioCheckInoutService.checkManual(outOrder.getBillNo())) {
|
||||||
|
ioCheckInoutService.check(outOrder.getBillNo());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue