package com.vincent.rsf.server.api.service.impl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.vincent.rsf.framework.common.Cools;
|
import com.vincent.rsf.framework.common.R;
|
import com.vincent.rsf.framework.exception.CoolException;
|
import com.vincent.rsf.server.api.controller.erp.params.*;
|
import com.vincent.rsf.server.api.controller.erp.params.dto.CheckDiffDto;
|
import com.vincent.rsf.server.api.controller.erp.params.dto.TransferInfoDto;
|
import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
|
import com.vincent.rsf.server.api.utils.TimeConverterUtils;
|
import com.vincent.rsf.server.common.domain.BaseParam;
|
import com.vincent.rsf.server.common.domain.PageParam;
|
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
|
import com.vincent.rsf.server.manager.controller.params.PakinItem;
|
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
|
import com.vincent.rsf.server.manager.entity.*;
|
import com.vincent.rsf.server.manager.enums.*;
|
import com.vincent.rsf.server.manager.service.*;
|
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
|
import com.vincent.rsf.server.manager.service.impl.WarehouseAreasItemServiceImpl;
|
import com.vincent.rsf.server.system.constant.DictTypeCode;
|
import com.vincent.rsf.server.system.constant.SerialRuleCode;
|
import com.vincent.rsf.server.system.entity.DictData;
|
import com.vincent.rsf.server.system.entity.Fields;
|
import com.vincent.rsf.server.system.service.DictDataService;
|
import com.vincent.rsf.server.system.service.DictTypeService;
|
import com.vincent.rsf.server.system.service.FieldsService;
|
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
|
import com.vincent.rsf.server.api.service.ReceiveMsgService;
|
import lombok.extern.slf4j.Slf4j;
|
import org.apache.commons.lang3.StringUtils;
|
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.scheduling.annotation.Async;
|
import org.springframework.stereotype.Service;
|
import org.springframework.transaction.annotation.Transactional;
|
|
import java.util.*;
|
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.stream.Collectors;
|
|
import static com.vincent.rsf.server.manager.enums.OrderWorkType.*;
|
|
/**
|
* @author Ryan
|
* @version 1.0
|
* @title ErpApiServiceImpl
|
* @description
|
* @create 2025/3/4 16:27
|
*/
|
@Slf4j
|
@Service("erpApiService")
|
public class ReceiveMsgServiceImpl implements ReceiveMsgService {
|
|
@Autowired
|
private PurchaseService purchaseService;
|
@Autowired
|
private PurchaseItemService purchaseItemService;
|
@Autowired
|
private FieldsService fieldsService;
|
@Autowired
|
private MatnrGroupService matnrGroupService;
|
@Autowired
|
private MatnrServiceImpl matnrService;
|
@Autowired
|
private AsnOrderService asnOrderService;
|
@Autowired
|
private AsnOrderLogService asnOrderLogService;
|
@Autowired
|
private AsnOrderItemService asnOrderItemService;
|
@Autowired
|
private DeliveryService deliveryService;
|
@Autowired
|
private DeliveryItemService deliveryItemService;
|
@Autowired
|
private LocService locService;
|
@Autowired
|
private WarehouseAreasService warehouseAreasService;
|
@Autowired
|
private WarehouseService warehouseService;
|
@Autowired
|
private CompanysService companysService;
|
@Autowired
|
private TransferService transferService;
|
@Autowired
|
private TransferItemService transferItemService;
|
@Autowired
|
private LocReviseService locReviseService;
|
@Autowired
|
private ReviseLogService reviseLogService;
|
@Autowired
|
private ReviseLogItemService reviseLogItemService;
|
@Autowired
|
private CheckDiffService checkDiffService;
|
@Autowired
|
private CheckDiffItemService checkDiffItemService;
|
@Autowired
|
private DictDataService dictDataService;
|
@Autowired
|
private DictTypeService dictTypeService;
|
@Autowired
|
private WaitPakinService waitPakinService;
|
@Autowired
|
private WarehouseAreasItemServiceImpl warehouseAreasItemService;
|
@Autowired
|
private LocItemService locItemService;
|
|
|
/**
|
* @author Ryan
|
* @date 2025/8/15
|
* @description: 保存PO/DO单据
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public boolean syncPurchasee(List<OrderParams> orders) {
|
if (orders.isEmpty()) {
|
throw new CoolException("单据内容不能为空！！");
|
}
|
orders.forEach(ors -> {
|
if (ors.getType().equals("po")) {
|
Purchase purchase = new Purchase();
|
BeanUtils.copyProperties(ors, purchase);
|
String wkVal = SerialRuleUtils.generateRuleCode(SerialRuleCode.PURCHASE_CODE, purchase);
|
purchase.setCode(wkVal)
|
.setType(OrderType.ORDER_IN.type);
|
if (!purchaseService.save(purchase)) {
|
throw new CoolException("采购单据保存失败");
|
}
|
|
//查询扩展字段是否存在
|
List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getStatus, 1).eq(Fields::getFlagEnable, 1));
|
|
//判断子列表不为空
|
if (!ors.getChildren().isEmpty()) {
|
ArrayList<PurchaseItem> list = new ArrayList<>();
|
ors.getChildren().forEach(orderItem -> {
|
PurchaseItem item = new PurchaseItem();
|
BeanUtils.copyProperties(orderItem, item);
|
// if (!fields.isEmpty()) {
|
// List<String> fieldValue = fields.stream().map(Fields::getFields).collect(Collectors.toList());
|
// fieldValue.forEach(value -> {
|
//
|
// });
|
// }
|
item.setPurchaseId(purchase.getId());
|
list.add(item);
|
});
|
if (!purchaseItemService.saveBatch(list)) {
|
throw new CoolException("采购单明细保存失败！！");
|
}
|
}
|
} else {
|
Delivery delivery = new Delivery();
|
BeanUtils.copyProperties(ors, delivery);
|
String wkVal = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_DELIVERY_RULE_CODE, delivery);
|
delivery.setCode(wkVal)
|
.setType(OrderType.ORDER_OUT.type);
|
if (!deliveryService.save(delivery)) {
|
throw new CoolException("采购单据保存失败");
|
}
|
|
//查询扩展字段是否存在
|
List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getStatus, 1).eq(Fields::getFlagEnable, 1));
|
|
//判断子列表不为空
|
if (!ors.getChildren().isEmpty()) {
|
ArrayList<DeliveryItem> list = new ArrayList<>();
|
ors.getChildren().forEach(orderItem -> {
|
DeliveryItem item = new DeliveryItem();
|
BeanUtils.copyProperties(orderItem, item);
|
// if (!fields.isEmpty()) {
|
// List<String> fieldValue = fields.stream().map(Fields::getFields).collect(Collectors.toList());
|
// fieldValue.forEach(value -> {
|
//
|
// });
|
// }
|
item.setDeliveryId(delivery.getId());
|
list.add(item);
|
});
|
if (!deliveryItemService.saveBatch(list)) {
|
throw new CoolException("采购单明细保存失败！！");
|
}
|
}
|
}
|
});
|
|
return true;
|
}
|
|
/**
|
* 物料信息同步
|
*
|
* @param matnrs
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public void syncMatnrs(List<BaseMatParms> matnrs) {
|
List<Matnr> syncMatnrs = new ArrayList<>();
|
if (!matnrs.isEmpty()) {
|
matnrs.forEach(matnr -> {
|
Matnr mat = new Matnr();
|
if (Objects.isNull(matnr.getMatnr())) {
|
throw new RuntimeException("物料编码不能为空！！");
|
}
|
BeanUtils.copyProperties(matnr, mat);
|
mat.setCode(matnr.getMatnr()).setName(matnr.getMaktx());
|
if (!Objects.isNull(matnr.getGroupName())) {
|
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnr.getGroupName()), false);
|
if (Objects.isNull(matnrGroup)) {
|
mat.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
|
}
|
}
|
syncMatnrs.add(mat);
|
});
|
|
if (!matnrService.saveOrUpdateBatch(syncMatnrs)) {
|
throw new CoolException("物料信息保存成功！！");
|
}
|
}
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/15
|
* @description: 订单查询
|
* @version 1.0
|
*/
|
@Override
|
public R queryOrderStatus(QueryOrderParam queryParams) {
|
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
|
.eq(WkOrder::getPoCode, queryParams.getOrderNo()));
|
if (Objects.isNull(wkOrders)) {
|
Map<String, Object> map = new HashMap<>();
|
map.put("exceStatus", "-1");
|
return R.ok("单据不存在 ！！").add(map);
|
}
|
|
AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));
|
if (!Objects.isNull(orderLog)) {
|
Map<String, Object> map = new HashMap<>();
|
map.put("exceStatus", "4");
|
return R.ok("单据已完成 ！！").add(map);
|
}
|
|
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrders.getId()));
|
|
WkOrderDto wkorderDto = new WkOrderDto();
|
wkorderDto.setOrder(wkOrders).setOrderItems(orderItems);
|
|
return R.ok().add(wkorderDto);
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/15
|
* @description: 查询库位信息
|
* @version 1.0
|
*/
|
@Override
|
public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
|
Page<Object> page = new Page<>();
|
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
|
IPage<LocStockDto> locStocks = locService.getLocDetls(page);
|
return R.ok().add(locStocks);
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/18
|
* @description: 库位同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncLocs(List<SyncLocsParams> locs) {
|
List<Loc> syncLocs = new ArrayList<>();
|
locs.forEach(loc -> {
|
Loc loc1 = new Loc();
|
BeanUtils.copyProperties(loc, loc1);
|
loc1.setCode(loc.getLocCode()).setId(null);
|
syncLocs.add(loc1);
|
});
|
if (!locService.saveBatch(syncLocs)) {
|
throw new CoolException("库位同步失败！！");
|
}
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/18
|
* @description: 物料分组信息同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncMatGroups(List<SyncMatGroupsParams> matGroupsParams) {
|
List<MatnrGroup> syncMatGroups = new ArrayList<>();
|
matGroupsParams.forEach(matGroupsParam -> {
|
MatnrGroup matnrGroup = new MatnrGroup();
|
BeanUtils.copyProperties(matGroupsParam, matnrGroup);
|
if (Objects.isNull(matGroupsParam.getCode())) {
|
throw new CoolException("物料分组编码不能为空！！");
|
}
|
if (Objects.isNull(matGroupsParam.getName())) {
|
throw new CoolException("分组名称不能为空！！");
|
}
|
if (Objects.isNull(matGroupsParam.getParCode())) {
|
throw new CoolException("上级物料分组编码不能为空！！");
|
}
|
syncMatGroups.add(matnrGroup);
|
});
|
if (!matnrGroupService.saveBatch(syncMatGroups)) {
|
throw new CoolException("物料分组保存失败！！");
|
}
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/18
|
* @description: 库区信息同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncWarehouseAreas(List<LocAreasParams> areasParams) {
|
areasParams.forEach(param -> {
|
WarehouseAreas locArea = new WarehouseAreas();
|
BeanUtils.copyProperties(param, locArea);
|
WarehouseAreas warehouseAreas = warehouseAreasService
|
.getOne(new LambdaQueryWrapper<WarehouseAreas>()
|
.eq(WarehouseAreas::getName, param.getName()));
|
if (!Objects.isNull(warehouseAreas)) {
|
locArea.setWarehouseId(warehouseAreas.getId());
|
}
|
locArea.setName(param.getName())
|
.setCode(param.getCode())
|
.setId(null);
|
if (!warehouseAreasService.save(locArea)) {
|
throw new CoolException("库区保存失败！！");
|
}
|
});
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/18
|
* @description: 仓库同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncWarehouse(List<WarehouseParams> warehouses) {
|
warehouses.forEach(warehouse -> {
|
Warehouse ware = new Warehouse();
|
BeanUtils.copyProperties(warehouse, ware);
|
ware.setId(null);
|
if (!warehouseService.save(ware)) {
|
throw new CoolException("仓库同步保存失败！！");
|
}
|
});
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/19
|
* @description: 同步企业信息
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncCompanies(List<CompaniesParam> companyParams) {
|
companyParams.forEach(param -> {
|
Companys companys = new Companys();
|
BeanUtils.copyProperties(param, companys);
|
if (Objects.isNull(companys.getCode())) {
|
throw new CoolException("企业编码不能为空！！");
|
}
|
Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()));
|
if (Objects.isNull(one)) {
|
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null);
|
companys.setCode(ruleCode);
|
} else {
|
throw new CoolException(one.getName() + "，企业名重复！！");
|
}
|
companys.setType(CompanysType.getCustomVal(param.getType()))
|
.setId(null);
|
if (!companysService.save(companys)) {
|
throw new CoolException("企业保存失败！！");
|
}
|
});
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/26
|
* @description: 单据同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
|
if (!syncOrders.isEmpty()) {
|
syncOrders.forEach(syncOrder -> {
|
WkOrder wkOrder = new WkOrder(syncOrder);
|
DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
|
.eq(DictData::getValue, syncOrder.getWkType()), false);
|
if (Objects.isNull(one)) {
|
throw new CoolException("单据：" + syncOrder.getOrderNo() + ", 业务类型不存在！！");
|
}
|
WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
|
.eq(!Objects.isNull(syncOrder.getOrderId()), WkOrder::getPoId, syncOrder.getOrderId())
|
.eq(WkOrder::getPoCode, syncOrder.getOrderNo()));
|
if (!Objects.isNull(order)) {
|
if (order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val) ||
|
order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
|
/**删除单据明细*/
|
asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
|
/**删除主单*/
|
asnOrderService.removeById(order.getId());
|
} else {
|
throw new CoolException("单据已添加，不可执行修改或添加操作！！");
|
}
|
}
|
String rule = SerialRuleCode.SYS_ASN_ORDER;
|
if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)) {
|
rule = SerialRuleCode.SYS_OUT_STOCK_CODE;
|
}
|
|
//银座特供
|
String orderNs = null;
|
if (rule.equals(SerialRuleCode.SYS_ASN_ORDER) || rule.equals(SerialRuleCode.SYS_OUT_STOCK_CODE)) {
|
StringBuffer buffer = new StringBuffer();
|
Object poCode = syncOrder.getOrderNo();
|
orderNs = poCode == null ? "" : buffer.append(poCode).toString();
|
}
|
String ruleCode = orderNs;
|
wkOrder.setType(syncOrder.getType())
|
.setWkType(one.getValue())
|
.setAnfme(syncOrder.getAnfme())
|
.setPoCode(syncOrder.getOrderNo())
|
.setWorkQty(0.0)//执行数量
|
.setQty(0.0)//完成数量
|
.setPoId(syncOrder.getOrderInternalCode())
|
.setCode(ruleCode)
|
.setArrTime(syncOrder.getArrTime())
|
.setId(null)
|
.setCreateTime(new TimeConverterUtils().timestampToDate(syncOrder.getCreateTime()))
|
.setBusinessTime(new TimeConverterUtils().timestampToDate(syncOrder.getBusinessTime()))
|
.setUpdateTime(new Date())
|
.setCreateBy(loginUserId)
|
.setUpdateBy(loginUserId);
|
|
if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)) {
|
wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
|
}
|
if (!asnOrderService.save(wkOrder)) {
|
throw new CoolException("单据保存失败！！");
|
}
|
AtomicReference<String> palletId = new AtomicReference<>();
|
syncOrder.getOrderItems().forEach(orderItem -> {
|
if (Cools.isEmpty(palletId.get())) {
|
palletId.set(orderItem.getPalletId());
|
} else {
|
if (!palletId.get().equals(orderItem.getPalletId())) {
|
throw new CoolException("同一个单据明细中的托盘码必须一致！！！");
|
}
|
}
|
Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
|
map.put("orderId", wkOrder.getId());
|
map.put("poId", wkOrder.getPoId());
|
map.put("poCode", wkOrder.getPoCode());
|
map.put("order_code", wkOrder.getCode());
|
map.put("matnrCode", orderItem.getMatnr());
|
map.put("platWorkCode", orderItem.getPlanNo());
|
map.put("platItemId", orderItem.getLineId());
|
map.put("splrBatch", orderItem.getBatch());
|
map.put("batch", orderItem.getBatch());
|
map.put("spec", orderItem.getSpecs());
|
map.put("model", orderItem.getModel());
|
map.put("stockUnit", orderItem.getUnit());
|
map.put("purUnit", orderItem.getUnit());
|
map.put("baseUnit", orderItem.getBaseUnitId());
|
map.put("useOrgId", orderItem.getUseOrgId());
|
map.put("useOrgName", orderItem.getUseOrgName());
|
map.put("erpClsId", orderItem.getErpClsId());
|
map.put("priceUnitId", orderItem.getPriceUnitId());
|
map.put("inStockType", orderItem.getInStockType());
|
map.put("ownerTypeId", orderItem.getOwnerTypeId());
|
map.put("ownerId", orderItem.getOwnerId());
|
map.put("ownerName", orderItem.getOwnerName());
|
map.put("keeperTypeId", orderItem.getKeeperTypeId());
|
map.put("keeperId", orderItem.getKeeperId());
|
map.put("keeperName", orderItem.getKeeperName());
|
map.put("targetWarehouseId", orderItem.getTargetWarehouseId());
|
map.put("sourceWarehouseId", orderItem.getSourceWarehouseId());
|
map.put("createBy", loginUserId);
|
map.put("updateBy", loginUserId);
|
|
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
|
throw new CoolException("明细保存失败！！");
|
}
|
});
|
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
|
.eq(WkOrderItem::getOrderId, wkOrder.getId()));
|
double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
|
wkOrder.setAnfme(sum);
|
if (!asnOrderService.updateById(wkOrder)) {
|
throw new CoolException("计划收货数量修改失败！！");
|
}
|
|
// 立即触发异步任务，不等待结果
|
if (!Cools.isEmpty(palletId.get()) && StringUtils.isNotBlank(syncOrder.getOrderNo()) && !Cools.isEmpty(syncOrder.getStationId())) {
|
//组托
|
WaitPakinParam pakinParam = new WaitPakinParam();
|
pakinParam.setBarcode(palletId.get());
|
pakinParam.setStaNo(syncOrder.getStationId());
|
|
boolean itemsCheck = waitPakinService.mergeItemsCheck(pakinParam, loginUserId);
|
if (itemsCheck) {
|
CompletableFuture.runAsync(() -> {
|
try {
|
asyncMergeItemsWcs(pakinParam, syncOrder.getOrderNo(), loginUserId);
|
} catch (Exception e) {
|
log.warn("订单 {} 开始自动组托", syncOrder.getOrderNo());
|
}
|
});
|
}
|
}
|
});
|
}
|
|
return R.ok();
|
}
|
|
@Async
|
public void asyncMergeItemsWcs(WaitPakinParam param, String orderNo, Long loginUserId) {
|
try {
|
int i = 0;
|
while (true) {
|
i++;
|
if (i > 5) return;
|
Thread.sleep(3000);
|
List<WarehouseAreasItem> list = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
|
.eq(WarehouseAreasItem::getAsnCode, orderNo));
|
|
if (list.isEmpty()) {
|
log.warn("订单 {} 没有找到库区项目，跳过组托", orderNo);
|
continue;
|
}
|
List<PakinItem> itemList = list.stream().map(item -> {
|
PakinItem pakinItem = new PakinItem();
|
pakinItem.setAsnCode(item.getAsnCode());
|
pakinItem.setId(item.getId());
|
pakinItem.setMatnrId(item.getMatnrId());
|
pakinItem.setReceiptQty(item.getAnfme());
|
return pakinItem;
|
}).collect(Collectors.toList());
|
param.setItems(itemList);
|
break;
|
}
|
waitPakinService.mergeItemsWcs(param, loginUserId);
|
log.info("订单 {} 自动组托完成，共处理 {} 个项目", orderNo, param.getItems().size());
|
} catch (Exception e) {
|
log.error("订单 {} 自动组托失败: {}", orderNo, e.getMessage(), e);
|
}
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/19
|
* @description: 调拔单据同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncTransfer(SyncTransferParams transferParams, Long loginUserId) {
|
Transfer transfer = new Transfer();
|
WarehouseAreas warehouseAreas = warehouseAreasService
|
.getOne(new LambdaQueryWrapper<WarehouseAreas>()
|
.eq(WarehouseAreas::getName, transferParams.getOrgAreaName()));
|
if (Objects.isNull(warehouseAreas)) {
|
throw new CoolException("原库区不存在！！");
|
}
|
|
WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
|
.eq(WarehouseAreas::getName, transferParams.getTarAreaName()));
|
if (Objects.isNull(warehouseAreas1)) {
|
throw new CoolException("目标库区不存在！！");
|
}
|
|
transfer.setOrgAreaName(warehouseAreas.getName())
|
.setOrgAreaId(warehouseAreas.getId())
|
.setOrgWareName(warehouseAreas.getWarehouseId$())
|
.setOrgWareId(warehouseAreas.getWarehouseId())
|
.setTarWareName(warehouseAreas1.getWarehouseId$())
|
.setTarAreaName(warehouseAreas1.getName())
|
.setTarAreaId(warehouseAreas1.getId())
|
.setTarWareName(warehouseAreas1.getWarehouseId$())
|
.setTarWareId(warehouseAreas1.getWarehouseId())
|
.setCreateBy(loginUserId)
|
.setCreateTime(new Date())
|
.setUpdateTime(new Date())
|
.setUpdateBy(loginUserId)
|
.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null))
|
.setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val);
|
|
if (!transferService.save(transfer)) {
|
throw new CoolException("调拔单据保存失败！！");
|
}
|
|
transferParams.getItems().forEach(item -> {
|
TransferItem transferItem = new TransferItem();
|
BeanUtils.copyProperties(item, transferItem);
|
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
|
if (Objects.isNull(matnr)) {
|
throw new CoolException("物料不存在！！");
|
}
|
transferItem.setMatnrId(matnr.getId())
|
.setTransferId(transfer.getId())
|
.setCreateBy(loginUserId)
|
.setUpdateBy(loginUserId)
|
.setCreateTime(new Date())
|
.setUpdateTime(new Date())
|
.setTransferCode(transfer.getCode());
|
|
if (!transferItemService.save(transferItem)) {
|
throw new CoolException("调拔单明细保存失败！！");
|
}
|
});
|
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/20
|
* @description: 库存调整单同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncLocRevise(SyncLocReviseParams reviseParams, Long loginUserId) {
|
LocRevise locRevise = new LocRevise();
|
if (Objects.isNull(reviseParams.getAreaName())) {
|
throw new CoolException("库区不能为空！！");
|
}
|
WarehouseAreas warehouseAreas = warehouseAreasService
|
.getOne(new LambdaQueryWrapper<WarehouseAreas>()
|
.eq(WarehouseAreas::getName, reviseParams.getAreaName()));
|
if (Objects.isNull(warehouseAreas)) {
|
throw new CoolException("库区不存在！！");
|
}
|
|
locRevise.setAreaName(warehouseAreas.getName())
|
.setType(LocReviseType.getLocRevise(reviseParams.getType()))
|
.setCreateBy(loginUserId)
|
.setUpdateBy(loginUserId)
|
.setCreateTime(new Date())
|
.setUpdateTime(new Date())
|
.setAreaId(warehouseAreas.getId());
|
locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null));
|
|
if (!locReviseService.save(locRevise)) {
|
throw new CoolException("库存调整单保存失败！！");
|
}
|
|
reviseParams.getReviseItems().forEach(revise -> {
|
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode()));
|
ReviseLog reviseLog = new ReviseLog();
|
BeanUtils.copyProperties(loc, reviseLog);
|
reviseLog.setReviseId(locRevise.getId())
|
.setLocCode(loc.getCode())
|
.setType(Integer.parseInt(loc.getType()))
|
.setCreateBy(loginUserId)
|
.setUpdateBy(loginUserId)
|
.setCreateTime(new Date())
|
.setUpdateTime(new Date())
|
.setReviseCode(locRevise.getCode());
|
if (!reviseLogService.save(reviseLog)) {
|
throw new CoolException("库存调整单不能为空！！");
|
}
|
revise.getItems().forEach(reviseItem -> {
|
ReviseLogItem logItem = new ReviseLogItem();
|
BeanUtils.copyProperties(reviseItem, logItem);
|
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, reviseItem.getMatnr()));
|
if (Objects.isNull(matnr)) {
|
throw new CoolException("物料不存在！！");
|
}
|
logItem.setLocId(loc.getId())
|
.setLocCode(loc.getCode())
|
.setId(null)
|
.setMaktx(matnr.getName())
|
.setMatnrCode(matnr.getCode())
|
.setMatnrId(matnr.getId())
|
.setReviseLogId(reviseLog.getId())
|
.setCreateBy(loginUserId)
|
.setUpdateBy(loginUserId)
|
.setCreateTime(new Date())
|
.setUpdateTime(new Date())
|
.setReviseQty(reviseItem.getAnfme());
|
if (!reviseLogItemService.save(logItem)) {
|
throw new CoolException("调整库存明细保存失败！！");
|
}
|
});
|
});
|
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/20
|
* @description: 单据修改--收货通知单/出库单/盘点单
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncOrderUpdate(List<SyncOrderParams> orders) {
|
orders.forEach(order -> {
|
List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
|
AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
|
WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
|
.in(WkOrder::getExceStatus, list)
|
.eq(WkOrder::getCode, order.getOrderNo()));
|
if (Objects.isNull(wkOrder)) {
|
throw new CoolException("请确认单据：" + order.getOrderNo() + "是否已经执行或是否同步！！");
|
}
|
order.getOrderItems().forEach(orderItem -> {
|
WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaUpdateWrapper<WkOrderItem>()
|
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
|
.eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
|
.eq(WkOrderItem::getOrderCode, wkOrder.getCode()));
|
if (!Objects.isNull(wkOrderItem)) {
|
if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
|
.eq(WkOrderItem::getOrderCode, wkOrder.getCode())
|
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
|
.eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
|
.eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
|
.set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
|
throw new CoolException("单据修改失败！！");
|
}
|
} else {
|
WkOrderItem wkOrderItem1 = new WkOrderItem();
|
BeanUtils.copyProperties(orderItem, wkOrderItem1);
|
wkOrderItem1.setOrderCode(wkOrder.getCode())
|
.setOrderId(wkOrder.getId());
|
if (!asnOrderItemService.save(wkOrderItem1)) {
|
throw new CoolException("单据保存失败！！");
|
}
|
}
|
});
|
wkOrder.setAnfme(order.getAnfme());
|
if (!asnOrderService.updateById(wkOrder)) {
|
throw new CoolException("主单据修改失败！！");
|
}
|
});
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/21
|
* @description: 删除单据
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncOrderDelete(List<SyncOrderParams> orders) {
|
orders.forEach(order -> {
|
List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
|
AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
|
WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
|
.in(WkOrder::getExceStatus, list)
|
.eq(WkOrder::getCode, order.getOrderNo()));
|
if (Objects.isNull(wkOrder)) {
|
throw new CoolException("订单：" + wkOrder.getCode() + "，当前状态，不可执行删除操作！！");
|
}
|
order.getOrderItems().forEach(orderItem -> {
|
if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
|
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
|
.eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
|
.eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
|
.eq(WkOrderItem::getOrderCode, wkOrder.getCode()))) {
|
throw new CoolException("单据明细删除失败！！");
|
}
|
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
|
if (orderItems.isEmpty()) {
|
if (!asnOrderService.removeById(wkOrder.getId())) {
|
throw new CoolException("单据删除失败！！");
|
}
|
} else {
|
Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
|
if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
|
.eq(WkOrder::getId, wkOrder.getId())
|
.set(WkOrder::getAnfme, sum))) {
|
throw new CoolException("主单数量修改失败！！");
|
}
|
}
|
});
|
});
|
return R.ok();
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/21
|
* @description: 调拔单明细查询
|
* @version 1.0
|
*/
|
@Override
|
public R queryTransfer(QueryOrderParam queryParams) {
|
Transfer transfer = transferService.getOne(new LambdaQueryWrapper<Transfer>()
|
.in(Transfer::getCode, queryParams.getOrderNo()));
|
if (Objects.isNull(transfer)) {
|
throw new CoolException("单据不存在！！");
|
}
|
List<TransferItem> orderItems = transferItemService.list(new LambdaQueryWrapper<TransferItem>()
|
.eq(TransferItem::getTransferId, transfer.getId()));
|
TransferInfoDto wkorderDto = new TransferInfoDto();
|
wkorderDto.setTransfer(transfer).setItems(orderItems);
|
return R.ok().add(wkorderDto);
|
}
|
|
/**
|
* @author Ryan
|
* @date 2025/8/22
|
* @description: 盘点差异单同步
|
* @version 1.0
|
*/
|
@Override
|
@Transactional(timeout = 60, rollbackFor = Exception.class)
|
public R syncCheckDiffs(SyncCheckDiffParams syncParams) {
|
List<CheckDiff> diffs = checkDiffService.list(new LambdaQueryWrapper<CheckDiff>()
|
.eq(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)
|
.in(CheckDiff::getOrderCode, syncParams.getDiffCode()));
|
if (diffs.isEmpty()) {
|
return R.ok();
|
}
|
List<CheckDiffDto> dtos = new ArrayList<>();
|
diffs.forEach(check -> {
|
CheckDiffDto checkDto = new CheckDiffDto();
|
CheckDiff checkDiff = new CheckDiff();
|
BeanUtils.copyProperties(check, checkDiff);
|
List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
|
.eq(CheckDiffItem::getCheckId, check.getId()));
|
checkDto.setItems(items)
|
.setCheckDiff(checkDiff);
|
dtos.add(checkDto);
|
});
|
|
return R.ok().add(dtos);
|
}
|
|
/**
|
* 基础物料信息变更
|
*
|
* @param baseMatParms
|
* @return
|
*/
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public R matUpdate(BaseMatParms baseMatParms) {
|
if (StringUtils.isBlank(baseMatParms.getMatnr())) {
|
throw new CoolException("物料编码不能为空！！");
|
}
|
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
|
if (Objects.isNull(matnr)) {
|
Matnr matnr1 = new Matnr();
|
BeanUtils.copyProperties(baseMatParms, matnr1);
|
matnr1.setCode(baseMatParms.getMatnr());
|
matnr1.setName(baseMatParms.getMaktx());
|
if (!Objects.isNull(baseMatParms.getGroupName())) {
|
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
|
.eq(MatnrGroup::getName, baseMatParms.getGroupName()));
|
if (!Objects.isNull(matnrGroup)) {
|
matnr1.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
|
}
|
}
|
if (!matnrService.save(matnr1)) {
|
throw new CoolException("物料新增失败！！");
|
}
|
} else {
|
if (!Objects.isNull(baseMatParms.getGroupName())) {
|
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
|
.eq(MatnrGroup::getName, baseMatParms.getGroupName()));
|
if (!Objects.isNull(matnrGroup)) {
|
matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
|
}
|
}
|
matnr.setName(baseMatParms.getMaktx())
|
.setColor(baseMatParms.getColor())
|
.setModel(baseMatParms.getModel())
|
.setSpec(baseMatParms.getSpec());
|
|
if (!matnrService.updateById(matnr)) {
|
throw new CoolException("物料更新失败！！");
|
}
|
}
|
|
return R.ok();
|
}
|
|
/**
|
* 库存查询明细（供open-api调用）
|
*
|
* @param condition 查询条件实体类
|
* @return 库存明细列表
|
*/
|
@Override
|
public R erpQueryInventoryDetails(InventoryQueryConditionParam condition) {
|
try {
|
// 参数验证
|
if (condition == null) {
|
return R.error("查询条件不能为空");
|
}
|
|
// 将ERP参数映射为数据库字段名（下划线格式）
|
Map<String, Object> queryMap = new HashMap<>();
|
|
// 从实体类中提取查询条件，映射为真实的数据库字段名
|
if (StringUtils.isNotBlank(condition.getLocId())) {
|
queryMap.put("loc_code", condition.getLocId());
|
}
|
if (StringUtils.isNotBlank(condition.getMatNr())) {
|
queryMap.put("matnr_code", condition.getMatNr());
|
}
|
if (StringUtils.isNotBlank(condition.getPlanNo())) {
|
queryMap.put("track_code", condition.getPlanNo());
|
}
|
if (StringUtils.isNotBlank(condition.getBatch())) {
|
queryMap.put("batch", condition.getBatch());
|
}
|
// 注意：orderNo 和 wareHouseId 不在 LocItem 表中，需要通过其他方式查询
|
// orderNo 已在后面单独处理（plat_order_code 和 plat_work_code）
|
// wareHouseId 需要通过 Loc 表关联查询，已在后面单独处理
|
|
BaseParam baseParam = new BaseParam();
|
baseParam.syncMap(queryMap);
|
PageParam<LocItem, BaseParam> pageParam = new PageParam<>(baseParam, LocItem.class);
|
|
QueryWrapper<LocItem> wrapper = pageParam.buildWrapper(false);
|
|
// 订单号/工单号/MES工单号
|
// 订单号可能存储在：1) LocItem.plat_order_code 2) LocItem.plat_work_code 3) WkOrder.code (通过orderId关联)
|
if (StringUtils.isNotBlank(condition.getOrderNo())) {
|
String orderNo = condition.getOrderNo();
|
|
// 先查询WkOrder表，获取匹配的订单ID列表
|
LambdaQueryWrapper<WkOrder> orderWrapper = new LambdaQueryWrapper<>();
|
orderWrapper.eq(WkOrder::getCode, orderNo);
|
List<WkOrder> matchingOrders = asnOrderService.list(orderWrapper);
|
List<Long> matchingOrderIds = matchingOrders.stream()
|
.map(WkOrder::getId)
|
.collect(Collectors.toList());
|
|
// 构建订单号查询条件：LocItem表的plat_order_code、plat_work_code，或通过orderId关联WkOrder.code
|
wrapper.and(w -> {
|
w.eq("plat_order_code", orderNo)
|
.or().eq("plat_work_code", orderNo);
|
// 如果找到了匹配的订单，也查询orderId
|
if (!matchingOrderIds.isEmpty()) {
|
w.or().in("order_id", matchingOrderIds);
|
}
|
});
|
}
|
|
// 物料组（需要通过物料表关联查询）
|
if (StringUtils.isNotBlank(condition.getMatGroup())) {
|
// 调用物料Service查询物料组对应的物料ID列表（复用已有方法）
|
LambdaQueryWrapper<Matnr> matnrWrapper = new LambdaQueryWrapper<>();
|
matnrWrapper.eq(Matnr::getGroupId, condition.getMatGroup());
|
List<Matnr> matnrs = matnrService.list(matnrWrapper);
|
if (!matnrs.isEmpty()) {
|
List<Long> matnrIds = matnrs.stream().map(Matnr::getId).collect(Collectors.toList());
|
wrapper.in("matnr_id", matnrIds);
|
} else {
|
// 如果没有找到物料，返回空结果
|
return R.ok().add(new ArrayList<>());
|
}
|
}
|
|
// 只查询正常状态的库存（status=1表示正常）
|
wrapper.eq("status", 1);
|
|
pageParam.setCurrent(1);
|
pageParam.setSize(Integer.MAX_VALUE);
|
PageParam<LocItem, BaseParam> pageResult = locItemService.page(pageParam, wrapper);
|
List<LocItem> locItems = pageResult.getRecords();
|
|
if (locItems.isEmpty()) {
|
return R.ok().add(new ArrayList<>());
|
}
|
|
// 获取所有需要关联的ID
|
List<Long> locIds = locItems.stream()
|
.map(LocItem::getLocId)
|
.filter(Objects::nonNull)
|
.distinct()
|
.collect(Collectors.toList());
|
|
List<Long> warehouseIds = new ArrayList<>();
|
List<Long> orderIds = locItems.stream()
|
.map(LocItem::getOrderId)
|
.filter(Objects::nonNull)
|
.distinct()
|
.collect(Collectors.toList());
|
|
// 调用LocService查询库位信息（复用Service层方法）
|
Map<Long, Loc> locMap = new HashMap<>();
|
if (!locIds.isEmpty()) {
|
List<Loc> locs = locService.listByIds(locIds);
|
locMap = locs.stream().collect(Collectors.toMap(Loc::getId, loc -> loc));
|
|
// 收集仓库ID
|
warehouseIds = locs.stream()
|
.map(Loc::getWarehouseId)
|
.filter(Objects::nonNull)
|
.distinct()
|
.collect(Collectors.toList());
|
}
|
|
// 仓库编码过滤
|
if (StringUtils.isNotBlank(condition.getWareHouseId())) {
|
String wareHouseId = condition.getWareHouseId();
|
LambdaQueryWrapper<Warehouse> whWrapper = new LambdaQueryWrapper<>();
|
whWrapper.eq(Warehouse::getCode, wareHouseId);
|
// 调用WarehouseService查询仓库信息（复用Service层方法）
|
List<Warehouse> warehouses = warehouseService.list(whWrapper);
|
if (!warehouses.isEmpty()) {
|
Long targetWarehouseId = warehouses.get(0).getId();
|
// 过滤库位，只保留目标仓库的库位
|
locMap = locMap.entrySet().stream()
|
.filter(entry -> Objects.equals(entry.getValue().getWarehouseId(), targetWarehouseId))
|
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
|
|
// 过滤locItems，只保留目标仓库的
|
Set<Long> validLocIds = locMap.keySet();
|
locItems = locItems.stream()
|
.filter(item -> item.getLocId() != null && validLocIds.contains(item.getLocId()))
|
.collect(Collectors.toList());
|
|
warehouseIds = Collections.singletonList(targetWarehouseId);
|
} else {
|
return R.ok().add(new ArrayList<>());
|
}
|
}
|
|
// 调用WarehouseService查询仓库信息（复用Service层方法）
|
Map<Long, Warehouse> warehouseMap = new HashMap<>();
|
if (!warehouseIds.isEmpty()) {
|
List<Warehouse> warehouses = warehouseService.listByIds(warehouseIds);
|
warehouseMap = warehouses.stream().collect(Collectors.toMap(Warehouse::getId, wh -> wh));
|
}
|
|
// 调用AsnOrderService查询订单信息（复用Service层方法）
|
Map<Long, WkOrder> orderMap = new HashMap<>();
|
if (!orderIds.isEmpty()) {
|
List<WkOrder> orders = asnOrderService.listByIds(orderIds);
|
orderMap = orders.stream().collect(Collectors.toMap(WkOrder::getId, order -> order));
|
}
|
|
// 转换结果
|
List<Map<String, Object>> result = new ArrayList<>();
|
for (LocItem locItem : locItems) {
|
Map<String, Object> details = convertToInventoryDetails(locItem, locMap, warehouseMap, orderMap);
|
if (details != null) {
|
result.add(details);
|
}
|
}
|
|
return R.ok().add(result);
|
} catch (Exception e) {
|
log.error("库存查询明细失败", e);
|
return R.error("查询失败：" + e.getMessage());
|
}
|
}
|
|
/**
|
* 转换为库存明细对象
|
*/
|
private Map<String, Object> convertToInventoryDetails(LocItem locItem, Map<Long, Loc> locMap,
|
Map<Long, Warehouse> warehouseMap,
|
Map<Long, WkOrder> orderMap) {
|
Map<String, Object> details = new HashMap<>();
|
|
// 库位编码
|
details.put("locId", locItem.getLocCode());
|
|
// 仓库信息
|
Loc loc = null;
|
if (locItem.getLocId() != null) {
|
loc = locMap.get(locItem.getLocId());
|
}
|
|
if (loc != null) {
|
// 托盘码（从库位的barcode获取）
|
details.put("palletId", loc.getBarcode());
|
|
// 仓库信息
|
if (loc.getWarehouseId() != null && warehouseMap.containsKey(loc.getWarehouseId())) {
|
Warehouse warehouse = warehouseMap.get(loc.getWarehouseId());
|
if (warehouse != null) {
|
details.put("wareHouseId", warehouse.getCode());
|
details.put("wareHouseName", warehouse.getName());
|
}
|
}
|
}
|
|
// 物料信息
|
details.put("matNr", locItem.getMatnrCode());
|
details.put("makTx", locItem.getMaktx());
|
details.put("spec", locItem.getSpec());
|
details.put("anfme", locItem.getAnfme());
|
details.put("unit", locItem.getUnit());
|
|
// 库存状态：1-正常(可用)，0-冻结
|
if (locItem.getStatus() != null) {
|
details.put("status", locItem.getStatus() == 1 ? "可用" : "冻结");
|
}
|
|
// 批次号
|
details.put("batch", locItem.getBatch());
|
|
// 计划跟踪号
|
details.put("planNo", locItem.getTrackCode());
|
|
// 订单信息
|
if (locItem.getOrderId() != null && orderMap.containsKey(locItem.getOrderId())) {
|
WkOrder order = orderMap.get(locItem.getOrderId());
|
if (order != null) {
|
// 订单号
|
details.put("orderNo", order.getCode());
|
details.put("orderType", null);
|
// 订单类型：1-出库单，2-入库单，3-调拔单
|
// 字符串类型映射：out->1(出库单), in->2(入库单), revise->(调拔单), check->(盘点单))
|
if (StringUtils.isNotBlank(order.getType())) {
|
String orderTypeStr = order.getType().toLowerCase().trim();
|
switch (orderTypeStr) {
|
case "out":
|
details.put("orderType", 1);
|
break;
|
case "in":
|
details.put("orderType", 2);
|
break;
|
case "revise":
|
break;
|
case "check":
|
break;
|
default:
|
break;
|
}
|
|
//包含 备料单关键词就变成3
|
if (StringUtils.isNotBlank(order.getWkType())) {
|
String workDesc = getWorkDesc(order.getWkType());
|
if (workDesc != null && workDesc.contains("备料单")) {
|
details.put("orderType", 3);
|
}
|
}
|
}
|
|
// 备料类型：根据业务类型判断
|
// 正常领料(1)，生产补料(2)
|
details.put("prepareType", 1);
|
if (StringUtils.isNotBlank(order.getWkType())) {
|
String workDesc = getWorkDesc(order.getWkType());
|
if (workDesc != null && workDesc.contains("生产补料")) {
|
details.put("prepareType", 2);
|
}
|
}
|
}
|
}
|
|
// 如果订单号为空，尝试从platOrderCode或platWorkCode获取
|
if (!details.containsKey("orderNo") || details.get("orderNo") == null) {
|
if (StringUtils.isNotBlank(locItem.getPlatOrderCode())) {
|
details.put("orderNo", locItem.getPlatOrderCode());
|
} else if (StringUtils.isNotBlank(locItem.getPlatWorkCode())) {
|
details.put("orderNo", locItem.getPlatWorkCode());
|
}
|
}
|
|
// 库存组织（从useOrgId获取）
|
details.put("stockOrgId", locItem.getUseOrgId());
|
|
return details;
|
}
|
}
|
