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 +