diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java index b899a74..7a59831 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java @@ -322,14 +322,14 @@ public class ProcessRouteController extends BaseController { return iProcessRouteService.generatePDFs(rooteProdet); } - @Log(title = "更新工序计划") + @Log(title = "更新计划时间") @SaCheckPermission("system:route:updateProcessPlan") @PostMapping("/updateProcessPlan") - public List updateProcessPlan(@RequestParam String rooteProdet) { + public List updateProcessPlan(@RequestParam String rooteProdet) { return iProcessRouteService.updateProcessPlan(rooteProdet); } /** - * 新增工艺路线 + * 保存工艺路线 */ @SaCheckPermission("system:route:add") @Log(title = "工艺路线", businessType = BusinessType.INSERT) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImMaterialServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImMaterialServiceImpl.java index 014f8d7..bc99dde 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImMaterialServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImMaterialServiceImpl.java @@ -66,7 +66,7 @@ public class ImMaterialServiceImpl implements IImMaterialService { // 初始化 JSON 对象,用于存储请求参数 JsonObject json = new JsonObject(); json.addProperty("FormId", "STK_Inventory"); // 设置查询的表单 ID - json.addProperty("FieldKeys", "FMaterialId.FNumber,FMaterialName,FStockName,FStockUnitId.FName,FBaseQty"); // 设置需要查询的字段 + json.addProperty("FieldKeys", "FMaterialId.FNumber,FMaterialName,F_UCHN_BaseProperty,FStockName,FStockUnitId.FName,FBaseQty"); // 设置需要查询的字段 JsonArray filterString = new JsonArray(); // 用于存储查询过滤条件的 JSON 数组 // 添加额外的过滤条件,排除售后库 JsonObject excludeStockFilter = new JsonObject(); @@ -294,9 +294,19 @@ public class ImMaterialServiceImpl implements IImMaterialService { String materialCode = record.getMaterialCode(); JsonObject jsonObject = jsonMap.get(materialCode); if (jsonObject != null) { - record.setUnit(jsonObject.get("FBaseQty").getAsString()); + JsonElement unitElement = jsonObject.get("FBaseQty"); + if (unitElement != null && !unitElement.isJsonNull()){ + record.setUnit(unitElement.getAsString()); + } + JsonElement qualityElement = jsonObject.get("F_UCHN_BaseProperty"); + if (qualityElement != null && !qualityElement.isJsonNull()) { + record.setMaterialQuality(qualityElement.getAsString()); + } else { + record.setMaterialQuality(""); } - + } else { + record.setMaterialQuality(""); + } // 计算可用库存 BigDecimal totalLockQty = lockStockMap.getOrDefault(materialCode, BigDecimal.ZERO);