From 83923ea389a172c1cf3d9cd7a3628d3692e9feaf Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期四, 18 一月 2024 18:14:12 +0800
Subject: [PATCH] add 工艺流程
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java | 1
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java | 4 ++
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java | 10 ++++-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/ProductProcessService.java | 28 ++++++++++++++
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 39 ++++++++++++-------
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 11 +++++
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/Query/ProductProcessQuery.java | 17 ++++++++
7 files changed, 92 insertions(+), 18 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/Query/ProductProcessQuery.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/Query/ProductProcessQuery.java
new file mode 100644
index 0000000..6c4cd46
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/Query/ProductProcessQuery.java
@@ -0,0 +1,17 @@
+package com.jcdm.main.bs.formulaChild.Query;
+
+import lombok.Data;
+
+@Data
+public class ProductProcessQuery {
+
+ /**
+ * 浜у搧缂栧彿
+ */
+ private String productCode;
+
+ /**
+ * 宸ュ簭
+ */
+ private String processesCode;
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index 3c54be3..ba5c4d2 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -1,25 +1,21 @@
package com.jcdm.main.bs.formulaChild.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.jcdm.common.annotation.Log;
import com.jcdm.common.core.controller.BaseController;
import com.jcdm.common.core.domain.AjaxResult;
+import com.jcdm.common.core.page.TableDataInfo;
import com.jcdm.common.enums.BusinessType;
+import com.jcdm.common.utils.poi.ExcelUtil;
+import com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService;
-import com.jcdm.common.utils.poi.ExcelUtil;
-import com.jcdm.common.core.page.TableDataInfo;
+import com.jcdm.main.bs.formulaChild.service.impl.ProductProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 閰嶆柟閰嶇疆瀛愪俊鎭疌ontroller
@@ -33,6 +29,9 @@
{
@Autowired
private IBsFormulaChildInfoService bsFormulaChildInfoService;
+
+ @Autowired
+ private ProductProcessService productProcessService;
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
@@ -52,6 +51,18 @@
}
/**
+ * 鏌ヨ宸ヨ壓娴佺▼
+ * @param productProcessQuery query
+ * @return list
+ */
+ @PostMapping("/getProductProcess")
+ public TableDataInfo getProductProcess(@RequestBody ProductProcessQuery productProcessQuery)
+ {
+ List<BsFormulaChildInfo> list = productProcessService.getProductProcess(productProcessQuery);
+ return getDataTable(list);
+ }
+
+ /**
* 瀵煎嚭閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
@PreAuthorize("@ss.hasPermi('bs:formulaChild:export')")
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java
index faf4468..04c273b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/mapper/BsFormulaChildInfoMapper.java
@@ -1,7 +1,9 @@
package com.jcdm.main.bs.formulaChild.mapper;
-import java.util.List;
+import com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
+
+import java.util.List;
/**
* 閰嶆柟閰嶇疆瀛愪俊鎭疢apper鎺ュ彛
@@ -9,7 +11,8 @@
* @author ruimin
* @date 2023-12-26
*/
-public interface BsFormulaChildInfoMapper
+
+public interface BsFormulaChildInfoMapper
{
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭�
@@ -58,4 +61,7 @@
* @return 缁撴灉
*/
public int deleteBsFormulaChildInfoByIds(Long[] ids);
+
+
+ public List<BsFormulaChildInfo> getProductProcess(ProductProcessQuery productProcessQuery);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/ProductProcessService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/ProductProcessService.java
new file mode 100644
index 0000000..35a42a7
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/ProductProcessService.java
@@ -0,0 +1,28 @@
+package com.jcdm.main.bs.formulaChild.service.impl;
+
+import com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery;
+import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
+import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ProductProcessService {
+
+ @Resource
+ private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
+
+ public List<BsFormulaChildInfo> getProductProcess(ProductProcessQuery productProcessQuery){
+
+
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoMapper.getProductProcess(productProcessQuery);
+
+// if (CollUtil.isNotEmpty(list)){
+// list = list.stream().sorted(Comparator.comparing(BsFormulaChildInfo::getStepSort)).collect(Collectors.toList());
+// }
+ return list;
+ }
+
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java
index a81f799..bd93747 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/Query/PrepareOnlineQuery.java
@@ -1,8 +1,12 @@
package com.jcdm.main.bs.orderScheduling.Query;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class PrepareOnlineQuery {
/**
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java
index 05be5aa..17621d1 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/PrepareOnlineController.java
@@ -22,7 +22,6 @@
private BsOrderSchedulingServiceImpl bsOrderSchedulingService;
-// @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody PrepareOnlineQuery prepareOnlineQuery)
{
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index 4810be1..24ab904 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -50,7 +50,16 @@
<include refid="selectBsFormulaChildInfoVo"/>
where id = #{id}
</select>
-
+
+ <select id="getProductProcess" parameterType="com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery" resultMap="BsFormulaChildInfoResult">
+ <include refid="selectBsFormulaChildInfoVo"/>
+ <where>
+ <if test="processesCode != null and processesCode != '' ">and processes_code = #{processesCode}</if>
+ <if test="productCode != null and productCode != '' ">and product_code = #{productCode}</if>
+ </where>
+ order by step_sort
+ </select>
+
<insert id="insertBsFormulaChildInfo" parameterType="BsFormulaChildInfo" useGeneratedKeys="true" keyProperty="id">
insert into bs_formula_child_info
<trim prefix="(" suffix=")" suffixOverrides=",">
--
Gitblit v1.9.3