From bb0237b2d273d2e4a57cbf197bfea44221934229 Mon Sep 17 00:00:00 2001 From: youjianchi Date: Sat, 13 Apr 2024 14:59:02 +0800 Subject: [PATCH] =?UTF-8?q?[update]:=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95-?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysMakeOrderController.java | 13 +- .../templates/system/makeorder/bmzgqr.html | 2 +- .../templates/system/makeorder/gcsh.html | 499 ++++++++++++++++++ 3 files changed, 506 insertions(+), 8 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java index caae79f6..b5e2045c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java @@ -84,6 +84,7 @@ public class SysMakeOrderController extends BaseController @GetMapping("/gcsh/{id}") public String gcsh(@PathVariable("id") Long id, ModelMap mmap) { + mmap.put("currentUser", ShiroUtils.getSysUser()); SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id); mmap.put("sysMakeOrder", sysMakeOrder); return prefix + "/gcsh"; @@ -124,17 +125,15 @@ public class SysMakeOrderController extends BaseController /** * 工程审核 - * @param makeNo + * @param sysMakeOrder * @return */ - @GetMapping("/gcReview/{makeNo}") + @PostMapping("/gcReview") @ResponseBody - public AjaxResult gcReview(@PathVariable("makeNo") String makeNo){ - SysMakeOrder makeOrder = new SysMakeOrder(); - makeOrder.setMakeNo(makeNo); + public AjaxResult gcReview(SysMakeOrder sysMakeOrder){ // 待生产 - makeOrder.setMakeStatus("3"); - sysMakeOrderService.updateByMakeNo(makeOrder); + sysMakeOrder.setMakeStatus("3"); + sysMakeOrderService.updateByMakeNo(sysMakeOrder); // todo 加工方式“采购”的物料生成采购计划 return AjaxResult.success("工程审核成功!"); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html index 4348f475..7ca89bbe 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html @@ -491,7 +491,7 @@ function submitHandler() { debugger var data = $("#form-makeorder-edit").serializeArray(); - alert(JSON.stringify(data)); + // alert(JSON.stringify(data)); // saveModal 保存不关闭 $.operate.save(prefix + "/deptLeaderConfirm", data); // var data = $('#bootstrap-sub-table-1').bootstrapTable('getData'); diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html new file mode 100644 index 00000000..8b67349d --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/gcsh.html @@ -0,0 +1,499 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+
+ +
+
+ + + + + \ No newline at end of file