工序修改

topsun-xt/src/main/webapp/biz/topsun/technology/processDetail.js

@@ -20,7 +20,7 @@ function loadResourceGrid() {
 		deleteHandler: function (){
 			var _grid = UICtrl.getGridManager('#resourceGrid');
 			DataUtil.delSelectedRows({
-				action: 'processResource/deleteProcessResource.ajax',
+				action: 'process/deleteProcessResource.ajax',
 				param: {},
 				gridManager: _grid,
 				idFieldName: 'processResourceId',
@@ -37,19 +37,23 @@ function loadResourceGrid() {
 						  required: true, type: "select",
 						  data: {
 							  type: 'system',
-							  name: "resourceSelect",
+							  name: "resourceNameGroup",
 							  back: {
-								  resourceId: "resourceId",
-								  resourceName:"resourceName",
+								  id: "resourceId",
+								  gxmc:"resourceName",
 								  version:"version",
-							  }
+							  },
+							  getParam: function () {
+								  return {paramValue: $("#processType").val()}
+							  },
 						  },
 					  }
 				  },
                   { display: "版本", name: "version", width: 200, minWidth: 60, type: "string", align: "left" },
                   ],
         dataAction: "server",
-     	url: web_app.name + '/processResource/slicedProcessResourceList.ajax',
+     	url: web_app.name + '/process/slicedProcessResourceList.ajax',
+		parms:{processId:$("#processId").val()},
      	pageSize: 20,
      	usePager: true,
      	toolbar: toolbarOptions,
@@ -79,7 +83,7 @@ function loadProcessMaterialGrid() {
 		deleteHandler: function (){
 			var _grid = UICtrl.getGridManager('#processMaterialGrid');
 			DataUtil.delSelectedRows({
-				action: 'processMaterialItem/deleteProcessMaterialItem.ajax',
+				action: 'process/deleteProcessMaterialItem.ajax',
 				param: {},
 				gridManager: _grid,
 				idFieldName: 'processMaterialItemId',
@@ -117,7 +121,8 @@ function loadProcessMaterialGrid() {
 			{ display: "物料相关内容", name: "materialJson", width: 400, minWidth: 60, type: "string", align: "left" },
 		],
 		dataAction: "server",
-		url: web_app.name + '/processMaterialItem/slicedProcessMaterialItems.ajax',
+		url: web_app.name + '/process/slicedProcessMaterialItems.ajax',
+		parms:{processId:$("#processId").val()},
 		pageSize: 20,
 		usePager: true,
 		toolbar: toolbarOptions,

topsun-xt/src/main/webapp/biz/topsun/technology/processList.js

@@ -106,7 +106,7 @@ function updateHandler(row){
 	UICtrl.addTabItem({
 		tabid: 'processDetail'+row.processId,
 		text: "修改工序",
-		url: web_app.name + '/process/addProcessDetail.do?processId='+row.processId
+		url: web_app.name + '/process/showProcessDetail.do?processId='+row.processId
 	})
 }
 

topsun/src/main/java/com/huigou/topsun/technology/application/ProcessMaterialItemApplication.java

@@ -18,4 +18,8 @@ public interface ProcessMaterialItemApplication {
 
     void saveProcessMaterialItem(String processId, List<ProcessMaterialItem> processMaterialList);
 
+    List<ProcessMaterialItem> slicedProcessMaterialItems(String processId);
+
+    void deleteByIds(List<String> ids);
+
 }

topsun/src/main/java/com/huigou/topsun/technology/application/ProcessResourceApplication.java

@@ -2,8 +2,10 @@ package com.huigou.topsun.technology.application;
 
 
 import com.huigou.topsun.technology.domain.model.ProcessResource;
+import com.huigou.topsun.technology.vo.ProcessResourceVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author 16508
@@ -12,10 +14,16 @@ import java.util.List;
 */
 public interface ProcessResourceApplication {
 
+    public static final String QUERY_XML_FILE_PATH = "config/topsun/technology/processResource.xml";
+
     ProcessResource saveProcessResource(ProcessResource processResource);
 
     void deleteByTechnologyProcessId(String technologyProcessId);
 
+    void deleteByIds(List<String> ids);
+
     void saveProcessResource(String processId, List<ProcessResource> resourceList);
 
+    List<ProcessResourceVo> slicedProcessResourceList(String processId);
+
 }

topsun/src/main/java/com/huigou/topsun/technology/application/impl/ProcessMaterialItemApplicationImpl.java

@@ -37,6 +37,18 @@ public class ProcessMaterialItemApplicationImpl implements ProcessMaterialItemAp
                     processMaterialItemRepository.save(processMaterialItem);
                 });
     }
+
+    @Override
+    public List<ProcessMaterialItem> slicedProcessMaterialItems(String processId) {
+        return processMaterialItemRepository.findByProcessId(processId);
+    }
+
+    @Override
+    public void deleteByIds(List<String> ids) {
+        ids.forEach(id->{
+            processMaterialItemRepository.delete(id);
+        });
+    }
 }
 
 

topsun/src/main/java/com/huigou/topsun/technology/application/impl/ProcessResourceApplicationImpl.java

 package com.huigou.topsun.technology.application.impl;
 
+import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.topsun.technology.application.ProcessResourceApplication;
 import com.huigou.topsun.technology.domain.model.ProcessResource;
 import com.huigou.topsun.technology.repository.ProcessResourceRepository;
+import com.huigou.topsun.technology.vo.ProcessResourceVo;
+import com.huigou.uasp.bmp.common.application.BaseApplication;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author 16508
@@ -14,7 +18,7 @@ import java.util.List;
 * @createDate 2023-11-22 11:04:03
 */
 @Service
-public class ProcessResourceApplicationImpl implements ProcessResourceApplication {
+public class ProcessResourceApplicationImpl extends BaseApplication implements ProcessResourceApplication {
     @Resource
     private ProcessResourceRepository processResourceRepository;
 
@@ -29,6 +33,13 @@ public class ProcessResourceApplicationImpl implements ProcessResourceApplicatio
         processResourceRepository.delete(processResourceList);
     }
 
+    @Override
+    public void deleteByIds(List<String> ids) {
+        ids.forEach(id->{
+            processResourceRepository.delete(id);
+        });
+    }
+
     @Override
     public void saveProcessResource(String processId, List<ProcessResource> resourceList) {
         resourceList
@@ -37,6 +48,12 @@ public class ProcessResourceApplicationImpl implements ProcessResourceApplicatio
                     processResourceRepository.save(processResource);
                 });
     }
+
+    @Override
+    public List<ProcessResourceVo> slicedProcessResourceList(String processId) {
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProcessResourceList");
+        return this.sqlExecutorDao.queryToList(queryDescriptor.getSql(),ProcessResourceVo.class,processId);
+    }
 }
 
 

topsun/src/main/java/com/huigou/topsun/technology/controller/ProcessController.java

@@ -2,9 +2,12 @@ package com.huigou.topsun.technology.controller;
 
 import com.huigou.cache.DictUtil;
 import com.huigou.topsun.technology.application.ProcessApplication;
+import com.huigou.topsun.technology.application.ProcessMaterialItemApplication;
+import com.huigou.topsun.technology.application.ProcessResourceApplication;
 import com.huigou.topsun.technology.domain.model.ProcessMaterialItem;
 import com.huigou.topsun.technology.domain.model.ProcessResource;
 import com.huigou.topsun.technology.domain.query.ProcessQueryRequest;
+import com.huigou.topsun.technology.vo.ProcessResourceVo;
 import com.huigou.topsun.technology.vo.ProcessVo;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.client.CommonController;
@@ -29,6 +32,10 @@ public class ProcessController extends CommonController {
 
     @Resource
     private ProcessApplication processApplication;
+    @Resource
+    private ProcessResourceApplication processResourceApplication;
+    @Resource
+    private ProcessMaterialItemApplication processMaterialItemApplication;
 
     public String forwardProcessList(){
         Map<String, String> processType = DictUtil.getDictionary("processType");
@@ -81,4 +88,31 @@ public class ProcessController extends CommonController {
         return success();
     }
 
+    public String slicedProcessResourceList(){
+        SDO sdo = getSDO();
+        String processId = sdo.getString("processId");
+        List<ProcessResourceVo> resourceList = processResourceApplication.slicedProcessResourceList(processId);
+        return packGridDataAndResult(resourceList);
+    }
+
+    public String deleteProcessResource(){
+        SDO sdo = getSDO();
+        List<String> ids = sdo.getIds();
+        processResourceApplication.deleteByIds(ids);
+        return success();
+    }
+
+    public String slicedProcessMaterialItems(){
+        SDO sdo = getSDO();
+        String processId = sdo.getString("processId");
+        List<ProcessMaterialItem> processMaterialItems = processMaterialItemApplication.slicedProcessMaterialItems(processId);
+        return packGridDataAndResult(processMaterialItems);
+    }
+
+    public String deleteProcessMaterialItem(){
+        SDO sdo = getSDO();
+        List<String> ids = sdo.getIds();
+        processMaterialItemApplication.deleteByIds(ids);
+        return success();
+    }
 }

topsun/src/main/java/com/huigou/topsun/technology/vo/ProcessResourceVo.java

+package com.huigou.topsun.technology.vo;
+
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 工序资源
+ * @TableName process_resource
+ */
+@Data
+public class ProcessResourceVo implements Serializable {
+    /**
+     * ID
+     */
+    private String processResourceId;
+
+    /**
+     * 所属工序ID
+     */
+    private String processId;
+
+    /**
+     * 使用的资源ID
+     */
+    private String resourceId;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * 资源名称
+     */
+    private String resourceName;
+}
\ No newline at end of file

topsun/src/main/resources/config/topsun/technology/processResource.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<query-mappings>
+
+	<query name="slicedProcessResourceList" label="工序资源表" table="process_resource">
+		<sql-query>
+			SELECT
+			 pr.process_resource_id,
+			 pr.process_id,
+			 pr.resource_id,
+			 CASE WHEN p.process_type = 'pakeage' THEN
+			 ( SELECT gxmc FROM res_bz t WHERE t.id = pr.resource_id )
+			 WHEN p.process_type = 'printing' THEN
+			 ( SELECT gxmc FROM res_ys t WHERE t.id = pr.resource_id )
+			  WHEN p.process_type = 'cropping' THEN
+			 ( SELECT gxmc FROM res_cj t WHERE t.id = pr.resource_id ) ELSE '' end AS resource_name
+			 FROM
+			 process_resource pr left join process p on p.process_id = pr.process_id
+			 WHERE pr.process_id = ?
+		</sql-query>
+	</query>
+
+</query-mappings>
\ No newline at end of file