| | |
| | | package com.vincent.rsf.server.api.service.impl; |
| | | |
| | | |
| | | import com.alibaba.fastjson.JSONArray; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | 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.common.domain.BaseParam; |
| | | import com.vincent.rsf.server.common.domain.PageParam; |
| | | import com.vincent.rsf.server.common.utils.FieldsUtils; |
| | | import com.vincent.rsf.server.common.utils.QuantityUtils; |
| | | import com.vincent.rsf.server.manager.controller.dto.LocStockDto; |
| | | 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.TransferItemServiceImpl; |
| | | 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.DictType; |
| | | import com.vincent.rsf.server.system.entity.Fields; |
| | | import com.vincent.rsf.server.system.service.FieldsItemService; |
| | | 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.service.impl.DictDataServiceImpl; |
| | | import com.vincent.rsf.server.system.utils.SerialRuleUtils; |
| | | import com.vincent.rsf.server.api.service.ReceiveMsgService; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.apache.poi.ss.formula.functions.T; |
| | | import org.apache.commons.lang3.StringUtils; |
| | | import org.springframework.beans.BeanUtils; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | |
| | | @Autowired |
| | | private FieldsService fieldsService; |
| | | @Autowired |
| | | private FieldsItemService fieldsItemService; |
| | | @Autowired |
| | | private MatnrGroupService matnrGroupService; |
| | | @Autowired |
| | | private MatnrServiceImpl matnrService; |
| | | @Autowired |
| | | private AsnOrderService asnOrderService; |
| | | @Autowired |
| | | private AsnOrderLogService asnOrderLogService; |
| | | @Autowired |
| | | private AsnOrderItemService asnOrderItemService; |
| | | @Autowired |
| | |
| | | @Autowired |
| | | private LocService locService; |
| | | @Autowired |
| | | private LocItemService locItemService; |
| | | private OrderWorkTypeService orderWorkTypeService; |
| | | @Autowired |
| | | private OrderTypeDictService orderTypeDictService; |
| | | @Autowired |
| | | private WarehouseAreasService warehouseAreasService; |
| | | @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 LocItemService locItemService; |
| | | @Autowired |
| | | private WaitPakinItemService waitPakinItemService; |
| | | @Autowired |
| | | private WarehouseAreasItemService warehouseAreasItemService; |
| | | |
| | | |
| | | /** |
| | |
| | | * @version 1.0 |
| | | */ |
| | | @Override |
| | | @Transactional(timeout = 60,rollbackFor = Exception.class) |
| | | @Transactional(timeout = 60, rollbackFor = Exception.class) |
| | | public boolean syncPurchasee(List<OrderParams> orders) { |
| | | if (orders.isEmpty()) { |
| | | throw new CoolException("单据内容不能为空!!"); |
| | |
| | | @Override |
| | | public R queryOrderStatus(QueryOrderParam queryParams) { |
| | | WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() |
| | | .in(WkOrder::getCode, queryParams.getOrderNo()) |
| | | .eq(WkOrder::getType, queryParams.getType())); |
| | | .eq(WkOrder::getPoCode, queryParams.getOrderNo())); |
| | | if (Objects.isNull(wkOrders)) { |
| | | throw new CoolException("单据不存在!!"); |
| | | 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(); |
| | |
| | | /** |
| | | * @author Ryan |
| | | * @date 2025/8/18 |
| | | * @description: 物料信息同步 |
| | | * @description: 物料分组信息同步 |
| | | * @version 1.0 |
| | | */ |
| | | @Override |
| | |
| | | return R.ok(); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * @author Ryan |
| | | * @date 2025/8/26 |
| | | * @description: 单据同步 |
| | | * @version 1.0 |
| | | */ |
| | | @Override |
| | | @Transactional(timeout = 60, rollbackFor = Exception.class) |
| | | public R syncCheckOrder(SyncOrderParams syncOrders, Long loginUserId) { |
| | | List<SyncOrdersItem> ordersItems = syncOrders.getItems(); |
| | | Map<String, List<SyncOrdersItem>> listMap = ordersItems.stream().collect(Collectors.groupingBy(SyncOrdersItem::getOrderCode)); |
| | | listMap.keySet().forEach(orderCode -> { |
| | | WkOrder wkOrder = new WkOrder(); |
| | | String ruleCode = null; |
| | | if (syncOrders.getType().equals(OrderType.ORDER_CHECK.type)) { |
| | | ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null); |
| | | } else if (syncOrders.getType().equals(OrderType.ORDER_IN.type)) { |
| | | ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null); |
| | | } else if (syncOrders.getType().equals(OrderType.ORDER_OUT.type)) { |
| | | ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, null); |
| | | } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) { |
| | | ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null); |
| | | } else if (syncOrders.getType().equals(OrderType.ORDER_TRANSFER.type)) { |
| | | ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null); |
| | | } |
| | | public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) { |
| | | if (!syncOrders.isEmpty()) { |
| | | syncOrders.forEach(syncOrder -> { |
| | | if (StringUtils.isBlank(syncOrder.getOrderInternalCode())) { |
| | | throw new CoolException("单据内码不能为空!!"); |
| | | } |
| | | // 明细 lineId(对应 platItemId)不能为空,且同一订单内不能重复 |
| | | if (syncOrder.getOrderItems() != null) { |
| | | Set<String> lineIds = new HashSet<>(); |
| | | for (SyncOrdersItem item : syncOrder.getOrderItems()) { |
| | | if (StringUtils.isBlank(item.getPlatItemId())) { |
| | | throw new CoolException("明细 lineId 不能为空!!"); |
| | | } |
| | | String lineId = item.getPlatItemId().trim(); |
| | | if (!lineIds.add(lineId)) { |
| | | throw new CoolException("同一订单内明细 lineId 不能重复:" + lineId); |
| | | } |
| | | } |
| | | } |
| | | WkOrder wkOrder = new WkOrder(); |
| | | // 兼容 wkType 传数字(类型码)或中文(显示名):先按 label 反查 type,否则按原值当 type |
| | | String wkTypeInput = syncOrder.getWkType(); |
| | | String typeCode = StringUtils.isBlank(wkTypeInput) ? null : orderWorkTypeService.getTypeByLabel(wkTypeInput); |
| | | if (typeCode == null) { |
| | | typeCode = wkTypeInput; |
| | | } |
| | | if (StringUtils.isBlank(typeCode) || orderWorkTypeService.getLabelByType(typeCode) == null) { |
| | | throw new CoolException("单据:" + syncOrder.getOrderNo() + ", 业务类型不存在!!"); |
| | | } |
| | | // 订单类型:支持数字 1/2/3、中文「出库单」/「入库单」/「调拨单」或内部码 out/in/transfer(来自字典) |
| | | String typeInput = syncOrder.getType(); |
| | | String resolvedOrderType = orderTypeDictService.resolveType(typeInput); |
| | | if (typeInput != null && !typeInput.trim().isEmpty() && resolvedOrderType == null) { |
| | | throw new CoolException("单据:" + syncOrder.getOrderNo() + ", 订单类型不存在!!"); |
| | | } |
| | | Loc serviceOne = null; |
| | | if (!Objects.isNull(syncOrder.getOrgLoc())) { |
| | | serviceOne = locService.getOne(new LambdaQueryWrapper<Loc>().eq(!Objects.isNull(syncOrder.getOrgLoc()), Loc::getCode, syncOrder.getOrgLoc())); |
| | | } |
| | | if (!Objects.isNull(serviceOne)) { |
| | | //TODO 添加调拔移库单功能 |
| | | } else { |
| | | // operateType=2 存在则修改、不存在则报错;operateType=1 存在则修改、不存在则新增 |
| | | WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() |
| | | .eq(WkOrder::getPoCode, syncOrder.getOrderInternalCode())); |
| | | if (!Objects.isNull(order)) { |
| | | // 仅未执行状态可被 order/add 修改(入库未执行、出库任务初始) |
| | | List<Short> editableStatus = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val); |
| | | if (!editableStatus.contains(order.getExceStatus())) { |
| | | throw new CoolException("仅未执行状态的单据可修改!!"); |
| | | } |
| | | // 存在则修改(1 和 2 均走此处),组托校验在 mergeOrderWithPakin/updateOrderNoPakin 内 |
| | | long pakinCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>() |
| | | .eq(WaitPakinItem::getAsnId, order.getId())); |
| | | if (pakinCount > 0) { |
| | | // 已组托:按 lineId(platItemId)合并,校验数量与删除 |
| | | mergeOrderWithPakin(order, syncOrder, resolvedOrderType, typeCode, loginUserId); |
| | | // 收货区已停用 // syncReceiptAreaByOrder(order.getId()); |
| | | return; // 本单已处理,跳过下方“新建主单+明细” |
| | | } |
| | | // 未组托:在原单上更新主单+明细,保留 exceStatus/qty/workQty,避免再次触发定时任务导致重复收货 |
| | | updateOrderNoPakin(order, syncOrder, loginUserId); |
| | | // 收货区已停用 // syncReceiptAreaByOrder(order.getId()); |
| | | return; |
| | | } else if (Integer.valueOf(2).equals(syncOrder.getOperateType())) { |
| | | // 仅 operateType=2 时要求单据必须存在 |
| | | throw new CoolException("单据不存在,无法修改!!"); |
| | | } |
| | | String rule = SerialRuleCode.SYS_ASN_ORDER; |
| | | if (resolvedOrderType != null && resolvedOrderType.equals(OrderType.ORDER_OUT.type)) { |
| | | rule = SerialRuleCode.SYS_OUT_STOCK_CODE; |
| | | } |
| | | // 有 orderNo 则直接作为 WMS 单号 code,否则按规则生成;po_code 存单据内码(orderInternalCode 已校验非空) |
| | | String wmsCode = StringUtils.isNotBlank(syncOrder.getOrderNo()) ? syncOrder.getOrderNo() : SerialRuleUtils.generateRuleCode(rule, null); |
| | | String poCodeVal = syncOrder.getOrderInternalCode(); |
| | | wkOrder.setType(resolvedOrderType != null ? resolvedOrderType : syncOrder.getType()) |
| | | .setWkType(typeCode) |
| | | .setAnfme(QuantityUtils.roundToScale(syncOrder.getAnfme())) |
| | | .setPoCode(poCodeVal) |
| | | .setWorkQty(0.0) |
| | | .setQty(0.0) |
| | | .setPoId(syncOrder.getOrderId()) |
| | | .setCode(wmsCode) |
| | | .setArrTime(syncOrder.getArrTime()) |
| | | .setStationId(syncOrder.getStationId()) |
| | | .setId(null) |
| | | .setCreateTime(new Date()) |
| | | .setUpdateTime(new Date()) |
| | | .setCreateBy(loginUserId) |
| | | .setUpdateBy(loginUserId); |
| | | |
| | | SyncOrdersItem ordersItem = listMap.get(orderCode).stream().findFirst().get(); |
| | | Double anfmes = listMap.get(orderCode).stream().mapToDouble(SyncOrdersItem::getAnfme).sum(); |
| | | wkOrder.setType(syncOrders.getType()) |
| | | .setWkType(OrderWorkType.getWorkType(ordersItem.getWkType())) |
| | | .setAnfme(anfmes) |
| | | .setPoCode(orderCode) |
| | | .setPoId(ordersItem.getId()) |
| | | .setCode(ruleCode) |
| | | .setId(null) |
| | | .setCreateTime(new Date()) |
| | | .setUpdateTime(new Date()) |
| | | .setCreateBy(loginUserId) |
| | | .setUpdateBy(loginUserId); |
| | | if (resolvedOrderType != null && resolvedOrderType.equals(OrderType.ORDER_OUT.type)) { |
| | | wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val); |
| | | } |
| | | |
| | | if (!asnOrderService.save(wkOrder)) { |
| | | throw new CoolException("单据保存失败!!"); |
| | | } |
| | | if (!asnOrderService.save(wkOrder)) { |
| | | throw new CoolException("单据保存失败!!"); |
| | | } |
| | | |
| | | listMap.get(orderCode).forEach(order -> { |
| | | WkOrderItem wkOrderItem = new WkOrderItem(); |
| | | BeanUtils.copyProperties(order, wkOrderItem); |
| | | wkOrderItem.setOrderCode(wkOrder.getCode()) |
| | | .setOrderId(wkOrder.getId()) |
| | | .setId(null); |
| | | syncOrder.getOrderItems().forEach(orderItem -> { |
| | | 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()); |
| | | |
| | | if (!asnOrderItemService.save(wkOrderItem)) { |
| | | throw new CoolException("单据明细保存失败!!"); |
| | | if (!asnOrderItemService.fieldsSave(map, loginUserId)) { |
| | | throw new CoolException("明细保存失败!!"); |
| | | } |
| | | }); |
| | | List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>() |
| | | .eq(WkOrderItem::getOrderId, wkOrder.getId())); |
| | | Double sum = QuantityUtils.roundToScale(orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum()); |
| | | wkOrder.setAnfme(sum); |
| | | if (!asnOrderService.updateById(wkOrder)) { |
| | | throw new CoolException("计划收货数量修改失败!!"); |
| | | } |
| | | } |
| | | }); |
| | | }); |
| | | |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | /** |
| | | * 已组托单据的修改合并:按 lineId(platItemId)匹配。 |
| | | * 规则:组托数量不会因改单而变;已组托 100 时,修改为 99 会报错,修改为 101 允许且多出的 1 可再组托。 |
| | | */ |
| | | private void mergeOrderWithPakin(WkOrder order, SyncOrderParams syncOrder, String resolvedOrderType, String typeCode, Long loginUserId) { |
| | | if (syncOrder.getOrderItems() != null) { |
| | | for (SyncOrdersItem it : syncOrder.getOrderItems()) { |
| | | if (StringUtils.isBlank(it.getPlatItemId())) { |
| | | throw new CoolException("明细 lineId 不能为空!!"); |
| | | } |
| | | } |
| | | } |
| | | List<WkOrderItem> existingItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId())); |
| | | List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnId, order.getId())); |
| | | Map<Long, Double> palletizedByItemId = pakinItems.stream() |
| | | .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId, Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0))); |
| | | palletizedByItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v)); |
| | | |
| | | Map<String, SyncOrdersItem> incomingByLineId = new HashMap<>(); |
| | | if (syncOrder.getOrderItems() != null) { |
| | | for (SyncOrdersItem it : syncOrder.getOrderItems()) { |
| | | incomingByLineId.put(it.getPlatItemId().trim(), it); |
| | | } |
| | | } |
| | | |
| | | Set<String> existingLineIds = existingItems.stream() |
| | | .map(e -> StringUtils.isNotBlank(e.getPlatItemId()) ? e.getPlatItemId().trim() : null) |
| | | .filter(Objects::nonNull) |
| | | .collect(Collectors.toSet()); |
| | | |
| | | for (WkOrderItem existing : existingItems) { |
| | | String lineId = StringUtils.isNotBlank(existing.getPlatItemId()) ? existing.getPlatItemId().trim() : null; |
| | | double palletized = palletizedByItemId.getOrDefault(existing.getId(), 0.0); |
| | | if (lineId == null || !incomingByLineId.containsKey(lineId)) { |
| | | if (palletized > 0) { |
| | | throw new CoolException("该明细已组托,需解除组托后才能删除!!"); |
| | | } |
| | | } else { |
| | | SyncOrdersItem inc = incomingByLineId.get(lineId); |
| | | Double newAnfme = QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : 0.0); |
| | | // 已组托数量不变:改小(如 100 改为 99)报错;改大(如 100 改为 101)允许,多出的可再组托 |
| | | if (QuantityUtils.compare(newAnfme, palletized) < 0) { |
| | | throw new CoolException("该明细数量不能小于已组托数量(已组托 " + palletized + "),需解除组托后才能修改!!"); |
| | | } |
| | | } |
| | | } |
| | | |
| | | order.setAnfme(QuantityUtils.roundToScale(syncOrder.getAnfme() != null ? syncOrder.getAnfme() : 0.0)); |
| | | if (syncOrder.getArrTime() != null) { |
| | | order.setArrTime(syncOrder.getArrTime()); |
| | | } |
| | | if (StringUtils.isNotBlank(syncOrder.getStationId())) { |
| | | order.setStationId(syncOrder.getStationId()); |
| | | } |
| | | order.setUpdateBy(loginUserId); |
| | | order.setUpdateTime(new Date()); |
| | | asnOrderService.updateById(order); |
| | | |
| | | for (WkOrderItem existing : existingItems) { |
| | | String lineId = StringUtils.isNotBlank(existing.getPlatItemId()) ? existing.getPlatItemId().trim() : null; |
| | | if (lineId == null || !incomingByLineId.containsKey(lineId)) { |
| | | asnOrderItemService.removeById(existing.getId()); |
| | | continue; |
| | | } |
| | | SyncOrdersItem inc = incomingByLineId.get(lineId); |
| | | existing.setAnfme(QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme())); |
| | | existing.setMaktx(inc.getMaktx()); |
| | | existing.setSpec(inc.getSpec()); |
| | | existing.setModel(inc.getModel()); |
| | | existing.setStockUnit(inc.getUnit()); |
| | | existing.setBatch(inc.getBatch()); |
| | | existing.setPlanNo(inc.getPlanNo()); |
| | | existing.setPalletId(inc.getPalletId()); |
| | | existing.setUpdateBy(loginUserId); |
| | | existing.setUpdateTime(new Date()); |
| | | asnOrderItemService.updateById(existing); |
| | | } |
| | | |
| | | for (Map.Entry<String, SyncOrdersItem> e : incomingByLineId.entrySet()) { |
| | | String key = e.getKey(); |
| | | if (!existingLineIds.contains(key)) { |
| | | Map<String, Object> map = new ObjectMapper().convertValue(e.getValue(), Map.class); |
| | | map.put("orderId", order.getId()); |
| | | map.put("poId", order.getPoId()); |
| | | map.put("poCode", order.getPoCode()); |
| | | map.put("order_code", order.getCode()); |
| | | map.put("matnrCode", e.getValue().getMatnr()); |
| | | map.put("platItemId", key); |
| | | if (!asnOrderItemService.fieldsSave(map, loginUserId)) { |
| | | throw new CoolException("明细保存失败!!"); |
| | | } |
| | | } |
| | | } |
| | | |
| | | Double sum = QuantityUtils.roundToScale(asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId())) |
| | | .stream().mapToDouble(WkOrderItem::getAnfme).sum()); |
| | | order.setAnfme(sum); |
| | | asnOrderService.updateById(order); |
| | | } |
| | | |
| | | /** |
| | | * 未组托单据的修改:在原单上更新主单+明细(按 lineId 匹配),保留 exceStatus、qty、workQty,避免删单重建导致定时任务再次执行。 |
| | | */ |
| | | private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId) { |
| | | if (syncOrder.getOrderItems() == null || syncOrder.getOrderItems().isEmpty()) { |
| | | throw new CoolException("修改时明细不能为空!!"); |
| | | } |
| | | Map<String, SyncOrdersItem> incomingByLineId = new HashMap<>(); |
| | | for (SyncOrdersItem it : syncOrder.getOrderItems()) { |
| | | if (StringUtils.isBlank(it.getPlatItemId())) { |
| | | throw new CoolException("明细 lineId 不能为空!!"); |
| | | } |
| | | incomingByLineId.put(it.getPlatItemId().trim(), it); |
| | | } |
| | | List<WkOrderItem> existingItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId())); |
| | | Set<String> existingLineIds = existingItems.stream() |
| | | .map(e -> StringUtils.isNotBlank(e.getPlatItemId()) ? e.getPlatItemId().trim() : null) |
| | | .filter(Objects::nonNull) |
| | | .collect(Collectors.toSet()); |
| | | |
| | | order.setAnfme(QuantityUtils.roundToScale(syncOrder.getAnfme() != null ? syncOrder.getAnfme() : 0.0)); |
| | | if (syncOrder.getArrTime() != null) { |
| | | order.setArrTime(syncOrder.getArrTime()); |
| | | } |
| | | if (StringUtils.isNotBlank(syncOrder.getStationId())) { |
| | | order.setStationId(syncOrder.getStationId()); |
| | | } |
| | | order.setUpdateBy(loginUserId); |
| | | order.setUpdateTime(new Date()); |
| | | asnOrderService.updateById(order); |
| | | |
| | | for (WkOrderItem existing : existingItems) { |
| | | String lineId = StringUtils.isNotBlank(existing.getPlatItemId()) ? existing.getPlatItemId().trim() : null; |
| | | if (lineId == null || !incomingByLineId.containsKey(lineId)) { |
| | | // 收货区已停用 // warehouseAreasItemService.remove(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnItemId, existing.getId())); |
| | | asnOrderItemService.removeById(existing.getId()); |
| | | continue; |
| | | } |
| | | SyncOrdersItem inc = incomingByLineId.get(lineId); |
| | | existing.setAnfme(QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme())); |
| | | existing.setMaktx(inc.getMaktx()); |
| | | existing.setSpec(inc.getSpec()); |
| | | existing.setModel(inc.getModel()); |
| | | existing.setStockUnit(inc.getUnit()); |
| | | existing.setBatch(inc.getBatch()); |
| | | existing.setPlanNo(inc.getPlanNo()); |
| | | existing.setPalletId(inc.getPalletId()); |
| | | existing.setUpdateBy(loginUserId); |
| | | existing.setUpdateTime(new Date()); |
| | | asnOrderItemService.updateById(existing); |
| | | } |
| | | |
| | | for (Map.Entry<String, SyncOrdersItem> e : incomingByLineId.entrySet()) { |
| | | if (existingLineIds.contains(e.getKey())) { |
| | | continue; |
| | | } |
| | | Map<String, Object> map = new ObjectMapper().convertValue(e.getValue(), Map.class); |
| | | map.put("orderId", order.getId()); |
| | | map.put("poId", order.getPoId()); |
| | | map.put("poCode", order.getPoCode()); |
| | | map.put("order_code", order.getCode()); |
| | | map.put("matnrCode", e.getValue().getMatnr()); |
| | | map.put("platItemId", e.getKey()); |
| | | if (!asnOrderItemService.fieldsSave(map, loginUserId)) { |
| | | throw new CoolException("明细保存失败!!"); |
| | | } |
| | | } |
| | | |
| | | Double sum = QuantityUtils.roundToScale(asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId())) |
| | | .stream().mapToDouble(WkOrderItem::getAnfme).sum()); |
| | | order.setAnfme(sum); |
| | | asnOrderService.updateById(order); |
| | | } |
| | | |
| | | /** 收货区已停用,方法整体注释 |
| | | * 订单修改后同步收货区:按 asnItemId 将收货区记录的 anfme 更新为订单明细的 anfme。 |
| | | */ |
| | | // private void syncReceiptAreaByOrder(Long orderId) { |
| | | // List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderId)); |
| | | // if (orderItems.isEmpty()) { |
| | | // return; |
| | | // } |
| | | // List<WarehouseAreasItem> areaItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getAsnId, orderId)); |
| | | // Map<Long, Double> itemAnfme = orderItems.stream().collect(Collectors.toMap(WkOrderItem::getId, i -> i.getAnfme() != null ? i.getAnfme() : 0.0, (a, b) -> b)); |
| | | // for (WarehouseAreasItem area : areaItems) { |
| | | // if (area.getAsnItemId() == null || !itemAnfme.containsKey(area.getAsnItemId())) { |
| | | // continue; |
| | | // } |
| | | // Double anfme = itemAnfme.get(area.getAsnItemId()); |
| | | // if (area.getAnfme() != null && area.getAnfme().equals(anfme)) { |
| | | // continue; |
| | | // } |
| | | // area.setAnfme(anfme); |
| | | // warehouseAreasItemService.updateById(area); |
| | | // } |
| | | // } |
| | | |
| | | /** |
| | | * @author Ryan |
| | |
| | | */ |
| | | @Override |
| | | @Transactional(timeout = 60, rollbackFor = Exception.class) |
| | | public R syncTransfer(SyncTransferParams transferParams) { |
| | | public R syncTransfer(SyncTransferParams transferParams, Long loginUserId) { |
| | | Transfer transfer = new Transfer(); |
| | | WarehouseAreas warehouseAreas = warehouseAreasService |
| | | .getOne(new LambdaQueryWrapper<WarehouseAreas>() |
| | | .eq(WarehouseAreas::getName, transfer.getOrgAreaName())); |
| | | .eq(WarehouseAreas::getName, transferParams.getOrgAreaName())); |
| | | if (Objects.isNull(warehouseAreas)) { |
| | | throw new CoolException("原库区不存在!!"); |
| | | } |
| | | |
| | | WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>() |
| | | .eq(WarehouseAreas::getName, transfer.getTarAreaName())); |
| | | .eq(WarehouseAreas::getName, transferParams.getTarAreaName())); |
| | | if (Objects.isNull(warehouseAreas1)) { |
| | | throw new CoolException("目标库区不存在!!"); |
| | | } |
| | |
| | | .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)) { |
| | |
| | | } |
| | | transferItem.setMatnrId(matnr.getId()) |
| | | .setTransferId(transfer.getId()) |
| | | .setCreateBy(loginUserId) |
| | | .setUpdateBy(loginUserId) |
| | | .setCreateTime(new Date()) |
| | | .setUpdateTime(new Date()) |
| | | .setTransferCode(transfer.getCode()); |
| | | |
| | | if (!transferItemService.save(transferItem)) { |
| | |
| | | */ |
| | | @Override |
| | | @Transactional(timeout = 60, rollbackFor = Exception.class) |
| | | public R syncLocRevise(SyncLocReviseParams reviseParams) { |
| | | public R syncLocRevise(SyncLocReviseParams reviseParams, Long loginUserId) { |
| | | LocRevise locRevise = new LocRevise(); |
| | | if (Objects.isNull(reviseParams.getAreaName())) { |
| | | throw new CoolException("库区不能为空!!"); |
| | |
| | | if (Objects.isNull(warehouseAreas)) { |
| | | throw new CoolException("库区不存在!!"); |
| | | } |
| | | locRevise.setAreaName(locRevise.getAreaName()) |
| | | |
| | | 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)); |
| | | |
| | |
| | | throw new CoolException("库存调整单保存失败!!"); |
| | | } |
| | | |
| | | reviseParams.getItems().forEach(revise -> { |
| | | 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()).setReviseCode(locRevise.getCode()); |
| | | 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("调整库存明细保存失败!!"); |
| | | } |
| | |
| | | */ |
| | | @Override |
| | | @Transactional(timeout = 60, rollbackFor = Exception.class) |
| | | public R syncOrderUpdate(SyncOrderParams orders) { |
| | | //入库单修改 |
| | | if (orders.getType().equals(OrderType.ORDER_IN.type)) { |
| | | orders.getItems().forEach(orderItem -> { |
| | | WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() |
| | | .eq(WkOrder::getType, OrderType.ORDER_IN.type) |
| | | .eq(WkOrder::getCode, orderItem.getOrderCode())); |
| | | if (Objects.isNull(order)) { |
| | | throw new CoolException("单据不存在!!"); |
| | | } |
| | | |
| | | if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>() |
| | | .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()) |
| | | .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode()) |
| | | .eq(WkOrderItem::getSplrBatch, orderItem.getBatch()) |
| | | .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) { |
| | | throw new CoolException("单据修改失败!!"); |
| | | } |
| | | |
| | | List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>() |
| | | .eq(WkOrderItem::getOrderId, order.getId())); |
| | | if (orderItems.isEmpty()) { |
| | | throw new CoolException("单据明细不存在!!"); |
| | | } |
| | | |
| | | Double summed = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum(); |
| | | order.setAnfme(summed); |
| | | |
| | | if (!asnOrderService.updateById(order)) { |
| | | throw new CoolException("单据修改失败!!"); |
| | | 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, QuantityUtils.roundToScale(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("单据保存失败!!"); |
| | | } |
| | | } |
| | | }); |
| | | } else { |
| | | |
| | | } |
| | | return null; |
| | | wkOrder.setAnfme(QuantityUtils.roundToScale(order.getAnfme())); |
| | | if (!asnOrderService.updateById(wkOrder)) { |
| | | throw new CoolException("主单据修改失败!!"); |
| | | } |
| | | }); |
| | | return R.ok(); |
| | | } |
| | | |
| | | /** |
| | |
| | | @Transactional(timeout = 60, rollbackFor = Exception.class) |
| | | public R syncOrderDelete(List<SyncOrderParams> orders) { |
| | | orders.forEach(order -> { |
| | | order.getItems().forEach(orderItem -> { |
| | | WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() |
| | | .eq(WkOrder::getType, order.getType()) |
| | | .in(WkOrder::getExceStatus, Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) |
| | | .eq(WkOrder::getId, orderItem.getOrderId())); |
| | | if (Objects.isNull(wkOrder)) { |
| | | throw new CoolException("订单:" + orderItem.getOrderCode() + ",当前状态,不可执行删除操作!!"); |
| | | // operateType=3:存在则判断是否可以取消;主要校验单据内码(orderInternalCode),orderNo 查到 1 条继续,查到多条则报错强调使用 orderInternalCode |
| | | WkOrder wkOrder = null; |
| | | if (StringUtils.isNotEmpty(order.getOrderInternalCode())) { |
| | | wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() |
| | | .eq(WkOrder::getPoCode, order.getOrderInternalCode())); |
| | | } |
| | | if (wkOrder == null && StringUtils.isNotEmpty(order.getOrderNo())) { |
| | | List<WkOrder> list = asnOrderService.list(new LambdaQueryWrapper<WkOrder>() |
| | | .eq(WkOrder::getCode, order.getOrderNo())); |
| | | if (list.isEmpty()) { |
| | | throw new CoolException("单据不存在,无法取消!!"); |
| | | } |
| | | if (list.size() > 1) { |
| | | throw new CoolException("单号对应多条单据,请使用单据内码(orderInternalCode)唯一指定后再取消!!"); |
| | | } |
| | | wkOrder = list.get(0); |
| | | } |
| | | if (wkOrder == null) { |
| | | throw new CoolException("单据不存在,无法取消!!请提供单据内码(orderInternalCode)或单号(orderNo)。"); |
| | | } |
| | | final WkOrder finalWkOrder = wkOrder; |
| | | // 已组托不可取消 |
| | | long pakinCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>() |
| | | .eq(WaitPakinItem::getAsnId, finalWkOrder.getId())); |
| | | if (pakinCount > 0) { |
| | | throw new CoolException("单据已组托,仅未组托状态可取消,请先解除组托!!"); |
| | | } |
| | | // 仅未执行状态可取消(入库未执行、出库任务初始) |
| | | List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, |
| | | AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val); |
| | | if (!list.contains(finalWkOrder.getExceStatus())) { |
| | | throw new CoolException("仅未执行状态的单据可取消!!"); |
| | | } |
| | | order.getOrderItems().forEach(orderItem -> { |
| | | if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>() |
| | | .eq(WkOrderItem::getMatnrId, orderItem.getMatnrId()) |
| | | .eq(WkOrderItem::getSplrBatch, orderItem.getBatch()) |
| | | .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) { |
| | | .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, finalWkOrder.getCode()))) { |
| | | throw new CoolException("单据明细删除失败!!"); |
| | | } |
| | | List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderItem.getOrderId())); |
| | | List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, finalWkOrder.getId())); |
| | | if (orderItems.isEmpty()) { |
| | | if (!asnOrderService.removeById(orderItem.getOrderId())) { |
| | | if (!asnOrderService.removeById(finalWkOrder.getId())) { |
| | | throw new CoolException("单据删除失败!!"); |
| | | } |
| | | } else { |
| | | Double sum = QuantityUtils.roundToScale(orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum()); |
| | | if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>() |
| | | .eq(WkOrder::getId, finalWkOrder.getId()) |
| | | .set(WkOrder::getAnfme, sum))) { |
| | | throw new CoolException("主单数量修改失败!!"); |
| | | } |
| | | } |
| | | }); |
| | |
| | | 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); |
| | | } |
| | | |
| | | /** |
| | | * 基础物料信息变更(对接协议 8.2) |
| | | * operateType:1新增 2修改 3禁用 4启用;不传或 1/2 时按有则更新、无则新增。 |
| | | */ |
| | | @Override |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public R matUpdate(BaseMatParms baseMatParms) { |
| | | if (StringUtils.isBlank(baseMatParms.getMatnr())) { |
| | | throw new CoolException("物料编码不能为空!!"); |
| | | } |
| | | Integer operateType = baseMatParms.getOperateType(); |
| | | // 3 禁用 / 4 启用:仅更新状态(status 1 正常 0 冻结) |
| | | if (Integer.valueOf(3).equals(operateType) || Integer.valueOf(4).equals(operateType)) { |
| | | Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr())); |
| | | if (matnr == null) { |
| | | throw new CoolException("物料不存在,无法执行禁用/启用!!"); |
| | | } |
| | | int status = Integer.valueOf(4).equals(operateType) ? 1 : 0; // 4 启用=1 正常,3 禁用=0 冻结 |
| | | matnr.setStatus(status); |
| | | if (!matnrService.updateById(matnr)) { |
| | | throw new CoolException(operateType == 4 ? "物料启用失败!!" : "物料禁用失败!!"); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | // 1 新增 / 2 修改 / 不传:有则更新、无则新增 |
| | | 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(); |
| | | } |
| | | |
| | | @Override |
| | | public R inventoryDetails(InventoryDetailsParam param) { |
| | | LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(LocItem::getDeleted, 0); |
| | | if (!Cools.isEmpty(param.getLocId())) { |
| | | wrapper.eq(LocItem::getLocCode, param.getLocId()); |
| | | } |
| | | if (!Cools.isEmpty(param.getMatNr())) { |
| | | wrapper.eq(LocItem::getMatnrCode, param.getMatNr()); |
| | | } |
| | | if (!Cools.isEmpty(param.getBatch())) { |
| | | wrapper.eq(LocItem::getBatch, param.getBatch()); |
| | | } |
| | | if (!Cools.isEmpty(param.getOrderNo())) { |
| | | wrapper.and(w -> w.eq(LocItem::getPlatOrderCode, param.getOrderNo()).or().eq(LocItem::getPlatWorkCode, param.getOrderNo())); |
| | | } |
| | | if (!Cools.isEmpty(param.getPlanNo())) { |
| | | wrapper.eq(LocItem::getPlatWorkCode, param.getPlanNo()); |
| | | } |
| | | if (!Cools.isEmpty(param.getWareHouseId())) { |
| | | Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId())); |
| | | if (wh != null) { |
| | | List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId())); |
| | | if (!locs.isEmpty()) { |
| | | wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList())); |
| | | } else { |
| | | return R.ok().add(Collections.emptyList()); |
| | | } |
| | | } else { |
| | | return R.ok().add(Collections.emptyList()); |
| | | } |
| | | } |
| | | List<LocItem> list = locItemService.list(wrapper); |
| | | List<Map<String, Object>> result = new ArrayList<>(); |
| | | for (LocItem item : list) { |
| | | Map<String, Object> row = new LinkedHashMap<>(); |
| | | row.put("locId", item.getLocCode()); |
| | | Loc loc = locService.getById(item.getLocId()); |
| | | if (loc != null && loc.getWarehouseId() != null) { |
| | | Warehouse w = warehouseService.getById(loc.getWarehouseId()); |
| | | row.put("wareHouseId", w != null ? w.getCode() : null); |
| | | row.put("wareHouseName", w != null ? w.getName() : null); |
| | | } else { |
| | | row.put("wareHouseId", null); |
| | | row.put("wareHouseName", null); |
| | | } |
| | | row.put("palletId", item.getTrackCode()); |
| | | row.put("matNr", item.getMatnrCode()); |
| | | row.put("makTx", item.getMaktx()); |
| | | row.put("anfme", item.getAnfme() != null ? item.getAnfme() : 0); |
| | | row.put("unit", item.getUnit()); |
| | | row.put("status", item.getStatus() != null ? item.getStatus() : 1); |
| | | row.put("orderType", item.getWkType()); |
| | | row.put("orderNo", item.getPlatOrderCode()); |
| | | row.put("planNo", item.getPlatWorkCode()); |
| | | row.put("batch", item.getBatch()); |
| | | result.add(row); |
| | | } |
| | | return R.ok().add(result); |
| | | } |
| | | |
| | | @Override |
| | | public R inventorySummary(InventorySummaryParam param) { |
| | | LambdaQueryWrapper<LocItem> wrapper = new LambdaQueryWrapper<>(); |
| | | wrapper.eq(LocItem::getDeleted, 0).select(LocItem::getLocId, LocItem::getMatnrCode, LocItem::getMaktx, LocItem::getAnfme, LocItem::getUnit); |
| | | if (!Cools.isEmpty(param.getWareHouseId())) { |
| | | Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId())); |
| | | if (wh != null) { |
| | | List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId())); |
| | | if (!locs.isEmpty()) { |
| | | wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList())); |
| | | } else { |
| | | return R.ok().add(Collections.emptyList()); |
| | | } |
| | | } else { |
| | | return R.ok().add(Collections.emptyList()); |
| | | } |
| | | } |
| | | if (!Cools.isEmpty(param.getMatNr())) { |
| | | List<String> matNrs = Arrays.asList(param.getMatNr().split(",")); |
| | | wrapper.in(LocItem::getMatnrCode, matNrs.stream().map(String::trim).collect(Collectors.toList())); |
| | | } |
| | | List<LocItem> list = locItemService.list(wrapper); |
| | | Map<String, Map<String, Object>> sumMap = new LinkedHashMap<>(); |
| | | for (LocItem item : list) { |
| | | Loc loc = locService.getById(item.getLocId()); |
| | | String whId = null; |
| | | String whName = null; |
| | | if (loc != null && loc.getWarehouseId() != null) { |
| | | Warehouse w = warehouseService.getById(loc.getWarehouseId()); |
| | | whId = w != null ? w.getCode() : null; |
| | | whName = w != null ? w.getName() : null; |
| | | } |
| | | String key = (whId != null ? whId : "") + "|" + (item.getMatnrCode() != null ? item.getMatnrCode() : ""); |
| | | final String finalWhId = whId; |
| | | final String finalWhName = whName; |
| | | sumMap.compute(key, (k, v) -> { |
| | | if (v == null) { |
| | | v = new LinkedHashMap<>(); |
| | | v.put("wareHouseId", finalWhId); |
| | | v.put("wareHouseName", finalWhName); |
| | | v.put("matNr", item.getMatnrCode()); |
| | | v.put("matTx", item.getMaktx()); |
| | | v.put("anfme", (item.getAnfme() != null ? item.getAnfme() : 0)); |
| | | v.put("unit", item.getUnit()); |
| | | } else { |
| | | v.put("anfme", ((Number) v.get("anfme")).doubleValue() + (item.getAnfme() != null ? item.getAnfme() : 0)); |
| | | } |
| | | return v; |
| | | }); |
| | | } |
| | | return R.ok().add(new ArrayList<>(sumMap.values())); |
| | | } |
| | | } |