diff --git a/src/main/java/com/xujie/modules/order/controller/PODetailController.java b/src/main/java/com/xujie/modules/order/controller/PODetailController.java index 7c1f98d..f0a5239 100644 --- a/src/main/java/com/xujie/modules/order/controller/PODetailController.java +++ b/src/main/java/com/xujie/modules/order/controller/PODetailController.java @@ -81,6 +81,17 @@ public class PODetailController { } } + @PostMapping("/syncOriTransitCycle") + @ApiOperation("同步运输周期(ori_transit_cycle)") + public R syncOriTransitCycle(@RequestBody List rows) { + try { + Map data = baseService.syncOriTransitCycle(rows); + return R.ok().put("data", data); + } catch (RuntimeException ex) { + return R.error(ex.getMessage()); + } + } + /** * 获取分页 diff --git a/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java b/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java index 6a8963e..e9c1b51 100644 --- a/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java +++ b/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java @@ -32,6 +32,12 @@ public interface IPODetailService extends IService { void batchUpdatePoDetail(List poDetailVoList); + /** + * 编辑模式「同步运输周期」(新增):对勾选行按新增口径重取 ori_transit_cycle 并连带重算 standard_tt/c_crd/c_eta。 + * 返回 summary(successCount/unmatchedCount/skipCount/skipDetails)与 rows。 + */ + Map syncOriTransitCycle(List rows); + /** * 导入创建 PO 订单。 * 业务语义: diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java index 1372aa5..47b7dcc 100644 --- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java @@ -1950,6 +1950,137 @@ public class PODetailServiceImpl extends ServiceImpl i } } + /** + * 编辑模式「同步运输周期」(新增方法,不改动原有逻辑): + * 对勾选行按新增口径重取 ori_transit_cycle 并连带重算 standard_tt/c_crd/c_eta。 + * 1) 取行内当前 departure/destination/shipVia(含未保存编辑);三项缺一则跳过; + * 2) 先回写 header 三字段,再复用原有 calculateCrd(loadPoHeader 会拿到最新值); + * 3) 复用原有 resolveOriTransitCycle(POHeader),用临时 header 取周期,不改动其实现; + * 4) c_crd_ori 不覆盖,仅库中为空且本次有 crd 时回填;单行失败不中断整批。 + */ + @Override + @Transactional + public Map syncOriTransitCycle(List rows) { + List> updatedRows = new ArrayList<>(); + List> skipDetails = new ArrayList<>(); + int successCount = 0; + int unmatchedCount = 0; + int skipCount = 0; + + if (CollectionUtils.isEmpty(rows)) { + return buildSyncResult(updatedRows, skipDetails, successCount, unmatchedCount, skipCount); + } + + String site = poFieldAuthSupport.requireSite(rows.get(0).getSite()); + String customer = poFieldAuthSupport.requireCustomer(rows.get(0).getCustomer()); + poFieldAuthSupport.validateWriteContext(site, customer); + + SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + String currentUserName = currentUser != null ? currentUser.getUsername() : "system"; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String currentTimeStr = sdf.format(new Date()); + + for (PODetailVo model : rows) { + if (!StringUtils.hasText(model.getOrderNo()) + || !StringUtils.hasText(model.getSite()) + || model.getItemNo() == null) { + skipCount++; + skipDetails.add(buildSyncSkip(model, "主键不完整,需包含 site、orderNo、itemNo")); + continue; + } + if (!StringUtils.hasText(model.getDeparture()) + || !StringUtils.hasText(model.getDestination()) + || !StringUtils.hasText(model.getShipVia())) { + skipCount++; + skipDetails.add(buildSyncSkip(model, "始发港/目的港/运输方式不完整,无法同步")); + continue; + } + PODetail existing = baseMapper.selectByPK( + model.getOrderNo(), model.getSite(), model.getItemNo()); + if (existing == null) { + skipCount++; + skipDetails.add(buildSyncSkip(model, "未找到订单明细")); + continue; + } + + // 先回写 header 三字段(updatePoHeaderForEdit 只更新非空列),保证头/明细一致 + POHeader portPatch = new POHeader(); + portPatch.setSite(model.getSite()); + portPatch.setOrderNo(model.getOrderNo()); + portPatch.setDeparture(model.getDeparture()); + portPatch.setDestination(model.getDestination()); + portPatch.setShipVia(model.getShipVia()); + poHeaderMapper.updatePoHeaderForEdit(portPatch); + + // 复用原有 resolveOriTransitCycle(POHeader):用临时 header 传行内当前值,不改动其实现 + POHeader transientHeader = new POHeader(); + transientHeader.setDeparture(model.getDeparture()); + transientHeader.setDestination(model.getDestination()); + transientHeader.setShipVia(model.getShipVia()); + Integer ori = resolveOriTransitCycle(transientHeader); + + // 复用原有 calculateCrd 重算相关日期(已先写 header,loadPoHeader 会取到最新值) + PODetail calc = new PODetail(); + calculateCrd(model, calc); + + PODetailVo upd = new PODetailVo(); + upd.setSite(model.getSite()); + upd.setOrderNo(model.getOrderNo()); + upd.setItemNo(model.getItemNo()); + upd.setOriTransitCycle(ori); + upd.setStandardTt(calc.getStandardTt()); + upd.setCrd(calc.getCrd()); + upd.setEta(calc.getEta()); + if (existing.getCrdOri() == null && calc.getCrd() != null) { + upd.setCrdOri(calc.getCrd()); + } + upd.setEdit(currentTimeStr); + upd.setEndPlanner(currentUserName); + + baseMapper.updatePoDetailForEdit(upd); + + if (ori == null) { + unmatchedCount++; + } + successCount++; + + Map r = new HashMap<>(); + r.put("orderNo", model.getOrderNo()); + r.put("itemNo", model.getItemNo()); + r.put("oriTransitCycle", ori); + r.put("standardTt", calc.getStandardTt()); + r.put("crd", calc.getCrd()); + r.put("eta", calc.getEta()); + updatedRows.add(r); + } + + return buildSyncResult(updatedRows, skipDetails, successCount, unmatchedCount, skipCount); + } + + /** 组装同步返回:summary 汇总 + rows 明细(新增私有方法)。 */ + private Map buildSyncResult(List> updatedRows, + List> skipDetails, + int successCount, int unmatchedCount, int skipCount) { + Map summary = new HashMap<>(); + summary.put("successCount", successCount); + summary.put("unmatchedCount", unmatchedCount); + summary.put("skipCount", skipCount); + summary.put("skipDetails", skipDetails); + Map result = new HashMap<>(); + result.put("summary", summary); + result.put("rows", updatedRows); + return result; + } + + /** 跳过行明细(新增私有方法)。 */ + private Map buildSyncSkip(PODetailVo model, String reason) { + Map m = new HashMap<>(); + m.put("orderNo", model == null ? null : model.getOrderNo()); + m.put("itemNo", model == null ? null : model.getItemNo()); + m.put("reason", reason); + return m; + } + private void validatePoDetailUpdate(PODetailVo model, PODetail existingDetail) { if (model.getAQty() != null) { // A_Qty 是唯一工作数量:校验申请、通过及累计发货不能超过本次目标数量 - rqrq