From b2bccc875bfca12e31b0dd50bd45964b430ac264 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 17 May 2024 13:49:39 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=A3=80=E9=AA=8C=E6=96=B0=E5=A2=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A=E7=9A=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E5=88=B6=E7=A8=8B=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E7=BC=96=E5=8F=B7=E6=8E=A5=E5=8F=A3=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=AF=B9=E5=BA=94=E5=88=B6?= =?UTF-8?q?=E7=A8=8B=E5=B7=A5=E5=BA=8F=E8=AF=A6=E6=83=85=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=90=88=E6=A0=BC=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ualityManufacturingCheckoutController.java | 11 + ...QualityManufacturingProcessController.java | 10 + .../QualityManufacturingProcessMapper.java | 5 + .../IQualityManufacturingProcessService.java | 5 + ...ualityManufacturingProcessServiceImpl.java | 9 + .../QualityManufacturingProcessMapper.xml | 7 +- .../manufacturingCheckout/checkoutReport.html | 402 +++++++++++------- 7 files changed, 290 insertions(+), 159 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java index 224afd9c..52671004 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingCheckoutController.java @@ -208,6 +208,17 @@ public class QualityManufacturingCheckoutController extends BaseController } + /* + * 查找制程工序编号列表 + * */ + @ResponseBody + @PostMapping("/getProcessCodeList") + public TableDataInfo getProcessCodeList(){ + startPage(); + List list = qualityManufacturingCheckoutService.selectAllProcess(); + return getDataTable(list); + } + /** * 点击详情的时候查询数据库中已有的物料信息 * */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java index 90415eb6..8cfc366c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java @@ -172,5 +172,15 @@ public class QualityManufacturingProcessController extends BaseController return toAjax(qualityManufacturingProcessService.restoreQualityManufacturingProcessById(id)); } + /* + * 查找与制程检验有关的制程工序通过制程工序编号 + * */ + @GetMapping("/getProcessByCode/{manufacturingProcessCode}") + @ResponseBody + public AjaxResult getProcessByCode(@PathVariable("manufacturingProcessCode") String manufacturingProcessCode) + { + QualityManufacturingProcess qualityManufacturingProcess = qualityManufacturingProcessService.selectQualityManufacturingProcessByCode(manufacturingProcessCode); + return AjaxResult.success(qualityManufacturingProcess); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java index bf24442e..7bef9cc5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java @@ -96,4 +96,9 @@ public interface QualityManufacturingProcessMapper * 查找制程工序列表 * */ List selectAllProcess(); + + /* + * 查找与制程检验有关的制程工序通过制程工序编号 + * */ + QualityManufacturingProcess selectQualityManufacturingProcessByCode(String manufacturingProcessCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java index b1a96f40..3445e0af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java @@ -81,4 +81,9 @@ public interface IQualityManufacturingProcessService * @return */ int restoreQualityManufacturingProcessById(Long manufacturingProcessAutoid); + + /* + * 查找与制程检验有关的制程工序通过制程工序编号 + * */ + QualityManufacturingProcess selectQualityManufacturingProcessByCode(String manufacturingProcessCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java index 401dcb49..2fc49bb0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java @@ -191,4 +191,13 @@ public class QualityManufacturingProcessServiceImpl implements IQualityManufactu { return qualityManufacturingProcessMapper.restoreQualityManufacturingProcessById(manufacturingProcessAutoid); } + + /* + * 查找与制程检验有关的制程工序通过制程工序编号 + * */ + @Override + public QualityManufacturingProcess selectQualityManufacturingProcessByCode(String manufacturingProcessCode) { + + return qualityManufacturingProcessMapper.selectQualityManufacturingProcessByCode(manufacturingProcessCode); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml index 42371987..76547a12 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml @@ -48,7 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where manufacturing_process_autoid = #{manufacturingProcessAutoid} - + + + insert into quality_manufacturing_process diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/checkoutReport.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/checkoutReport.html index 302b59fb..2003494e 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/checkoutReport.html +++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/checkoutReport.html @@ -3,6 +3,28 @@ +
@@ -33,47 +55,32 @@
- - - - - - - - - - - - - -
- -
-
- - -
+
+
+ 选择制程工序 + + 添加制程工序 +
-
-
- -
- +
+
- -
+ - \ No newline at end of file +