hbyt/evoToK3Cloud
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新物料查询接口接口,增加材质查询

Browse Source
This commit is contained in:
tzy1042411602 2024-11-18 08:52:33 +08:00
parent f32f69fdc9
commit 762cad12d3
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-system/src/main/java/com/ruoyi/system/controller/ProcessRouteController.java
View File

@ -322,14 +322,14 @@ public class ProcessRouteController extends BaseController {
return iProcessRouteService.generatePDFs(rooteProdet); return iProcessRouteService.generatePDFs(rooteProdet);
} }
@Log(title = "更新工序计划") @Log(title = "更新计划时间")
@SaCheckPermission("system:route:updateProcessPlan") @SaCheckPermission("system:route:updateProcessPlan")
@PostMapping("/updateProcessPlan") @PostMapping("/updateProcessPlan")
public List<Model> updateProcessPlan(@RequestParam String rooteProdet) { public List<Model> updateProcessPlan(@RequestParam String rooteProdet) {
return iProcessRouteService.updateProcessPlan(rooteProdet); return iProcessRouteService.updateProcessPlan(rooteProdet);
} }
/** /**
* 新增工艺路线 * 保存工艺路线
*/ */
@SaCheckPermission("system:route:add") @SaCheckPermission("system:route:add")
@Log(title = "工艺路线", businessType = BusinessType.INSERT) @Log(title = "工艺路线", businessType = BusinessType.INSERT)

16
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImMaterialServiceImpl.java
View File

@ -66,7 +66,7 @@ public class ImMaterialServiceImpl implements IImMaterialService {
// 初始化 JSON 对象，用于存储请求参数 // 初始化 JSON 对象，用于存储请求参数
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
json.addProperty("FormId", "STK_Inventory"); // 设置查询的表单 ID 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 数组 JsonArray filterString = new JsonArray(); // 用于存储查询过滤条件的 JSON 数组
// 添加额外的过滤条件，排除售后库 // 添加额外的过滤条件，排除售后库
JsonObject excludeStockFilter = new JsonObject(); JsonObject excludeStockFilter = new JsonObject();
@ -294,9 +294,19 @@ public class ImMaterialServiceImpl implements IImMaterialService {
String materialCode = record.getMaterialCode(); String materialCode = record.getMaterialCode();
JsonObject jsonObject = jsonMap.get(materialCode); JsonObject jsonObject = jsonMap.get(materialCode);
if (jsonObject != null) { 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); BigDecimal totalLockQty = lockStockMap.getOrDefault(materialCode, BigDecimal.ZERO);