打样申请 多级联动

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js

-var gridManager = null, refreshFlag = false,istoolbar=true;
-//定义控件列
-const bom=
-	[
-	{ display: "物料", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
-		{ display: "物料数量", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" },
-		{ display: "产品", name: "productId", width: 120, minWidth: 60, type: "string", align: "left" }
-	]
-const technology=[
-	{ display: "工艺", name: "materialId", width: 140, minWidth: 60, type: "string", align: "left", hidden: true  }
-]
-const process=[
-	{ display: "工序内容", name: "materialId", width: 140, minWidth: 60, type: "string", align: "left", hidden: true  },
-	{ display: "工序名称", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
-	{ display: "工序说明", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" },
-	{ display: "工序类别", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" },
-	{ display: "工时", name: "productName", width: 120, minWidth: 60, type: "string", align: "left" }
-]
-const processBom=[
-	{ display: "物料", name: "materialId", width: 140, minWidth: 60, type: "string", align: "left", hidden: true  },
-	{ display: "SAP物料详细信息", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
-	{ display: "使用的物料数量", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" },
-	{ display: "物料计量单位", name: "productName", width: 120, minWidth: 60, type: "string", align: "left" }
-]
-
+
+var gridManager = null;
 
 $(document).ready(function() {
 	initializateUI();
-	loadOrgTreeView();
-	bindQueryEvent();
-	loadProofingApplyGrid(null,bom,"mobTableGrid","");//加载BOm
-	loadProofingApplyGrid(null,technology,"technologyGrid","");//加载工艺
-	loadProofingApplyGrid(null,process,"processGrid","");//加载工序
-	loadProofingApplyGrid(null,processBom,"processBomGrid","");//加载物料
-	echo("productId");
-	echo("productType")
+	loadTechnologyListGrid();
 });
 
 
-function echo(node){
-	$("#"+node+"_text").val($("#"+node).val())
-}
-
-
-//工艺、工序、工序物料三级联动
-function test(){
-
-}
-
-
 function initializateUI() {
 	UICtrl.layout("#layout", {leftWidth: 3});
-
 }
 
-
-
-
-//创建表格（参数、列、插入的节点、请求地址）
-function loadProofingApplyGrid(param,columns,node,url) {
-
-
-	const toolbarOptions = istoolbar
-		? UICtrl.getDefaultToolbarOptions({
-			addHandler: addHandler,
-			updateHandler() {
+function loadTechnologyListGrid() {
+	var toolbarOptions = UICtrl.getDefaultToolbarOptions({
+		// addHandler: function(){
+		// 	addHandler();
+		// },
+		updateHandler: function(){
 			updateHandler();
 		},
 		deleteHandler: deleteHandler,
-		})
-		: null;
-	istoolbar = false;
-
-
-	gridManager =  UICtrl.grid("#"+node, {
-		columns: columns,
+	});
+	gridManager =  UICtrl.grid("#proofingMakeTableGrid", {
+		columns: 	[
+			{ display: "制造单号", name: "proofingMakeNo", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "申请单号", name: "proofingApplyNo", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "产品编号", name: "productId", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "品牌客户编号", name: "customerId", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "版面需求时间", name: "proofingApplyPageNeedTime", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "完成日期", name: "proofingApplyCompleteDate", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "样品中文名称", name: "proofingApplySampleCnName", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "样品英文名称", name: "proofingApplySampleEnName", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "样品版次", name: "proofingApplySampleVersion", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "样品规格", name: "proofingApplySampleSize", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "样品数量", name: "proofingApplySampleNum", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "产量情况", name: "proofingApplyOutputSituation", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "产品代号", name: "proofingApplyProductNo", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "版面", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "分配方式", name: "proofingApplyAllocationType", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "产品类别", name: "materialName", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "表面处理", name: "proofingApplySurfaceTreatment", width: 140, minWidth: 60, type: "string", align: "left" },
+			{ display: "NG重新打样原因", name: "proofingApplyNgReReason", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "测试标准", name: "proofingApplyTestStandard", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "申请单状态", name: "proofingApplyApplicationStatus", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "颜色种类", name: "colorType", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "专", name: "expert", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "网版目数", name: "printingPlateNum", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "啤版目数", name: "beerPlateNum", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "模切板模数", name: "dieBoardNum", width: 120, minWidth: 60, type: "string", align: "left" },
+			{ display: "标准色号", name: "materialNumber", width: 120, minWidth: 60, type: "string", align: "left" },
+		],
 		dataAction: "server",
-		url: web_app.name + '/proofingApply/'+url+'.ajax',
-		parms:param,
-		pageSize: 10,
+		url: web_app.name + '/proofingMake/slicedQueryProofingMake.ajax',
+		pageSize: 20,
 		usePager: true,
 		toolbar: toolbarOptions,
 		width: "100%",
-		height: "50%",
+		height: "100%",
 		heightDiff: -8,
 		checkbox: true,
 		fixedCellHeight: true,
 		selectRowButtonOnly: true,
-		//双击行响应事件
 		onDblClickRow : function(data, rowindex, rowobj) {
-			updateHandler(data.id);
+			updateHandler(data.proofingMakeId);
 		}
 	});
 	UICtrl.setSearchAreaToggle(gridManager);
 }
 
-function loadOrgTreeView() {
-	//ssrfOrgRootId hxPurchaseCommon.js
-	$('#orgTree').commonTree({
-		loadTreesAction:'org/queryOrgs.ajax',
-		parentId :ssrfOrgRootId,
-		getParam : function(e){
-			return {showDisabledOrg:0,displayableOrgKinds : "ogn,dpt"};
-		},
-		changeNodeIcon:function(data){
-			data[this.options.iconFieldName]= OpmUtil.getOrgImgUrl(data.orgKindId, data.status);
-		},
-		IsShowMenu:false,
-		onClick :onFolderTreeNodeClick
-	});
-}
-
-function onFolderTreeNodeClick(data) {
-	var html=[];
-	html.push('<span class="tomato-color">[',data.name,']</span>','编号规则管理');
-	$('#layout').layout('setCenterTitle',html.join(''));
-	$('#treefullId').val(data.fullId);
-	if (gridManager) {
-		UICtrl.gridSearch(gridManager,{fullId:data.fullId});
-	}
-}
-//绑定selectC
-function bindQueryEvent(){
-	$('#productId').searchbox({
-		type : "product",name : "productCode",
-		onChange:function(value,data){
-			$('#productId').val(data.productId);
-			loadProofingApplyGrid({id:data.productId},bom,"mobTableGrid","slicedQueryBomRule");
-		}
-	});
-
-	// $('#productType').searchbox({
-	// 	type : "product",name : "productType",
-	// 	onChange:function(value,data){
-	// 		$('#productType').val(data.productCategoryId);
-	//
-	// 		console.log($('#productType').val())
-	// 	}
-	// });
-
-}
 function query(obj) {
 	var param = $(obj).formToJSON();
 	UICtrl.gridSearch(gridManager, param);
@@ -152,19 +81,14 @@ function resetForm(obj) {
 	$(obj).formClean();
 }
 
-function updateHandler(id){
-	if(!id){
-		var id = DataUtil.getUpdateRowId(gridManager);
-		if (!id){ return; }
-	}
+function addHandler(){
 	UICtrl.showAjaxDialog({
-		url: web_app.name + '/codeRule/showLoadCodeRule.load',
-		title: "修改BOM",
-		width: 340,
-		param:{id:id},
+		url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
+		title: "新增打样制造单",
+		width: 1000,
 		ok: function(div){
 			var _self=this;
-			$('#submitForm',div).ajaxSubmit({url: web_app.name + '/codeRule/updateCodeRule.ajax',
+			$('#submitForm',div).ajaxSubmit({url: web_app.name + '/proofingMake/saveProofingMake.ajax',
 				success : function() {
 					_self.close();
 					reloadGrid();
@@ -174,139 +98,49 @@ function updateHandler(id){
 	});
 }
 
-// 查询
-function query(obj) {
-	var param = $(obj).formToJSON();
-	UICtrl.gridSearch(gridManager, param);
-}
-
-//刷新表格
-function reloadGrid() {
-	gridManager.loadData();
-}
-
-//重置表单
-function resetForm(obj) {
-	$(obj).formClean();
-}
-
-//关闭对话框
-function dialogClose(){
-	if(refreshFlag){
-		reloadGrid();
-		refreshFlag=false;
+function updateHandler(proofingMakeId){
+	if (!proofingMakeId) {
+		console.log(gridManager)
+		//获取所选行id
+		proofingMakeId = DataUtil.getUpdateRowId(gridManager);
+		if (!proofingMakeId) {
+			return;
+		}
 	}
-}
-
-//添加按钮
-function addHandler() {
 	UICtrl.showAjaxDialog({
-		title: $.i18nProp('添加BOM'),
-		url : web_app.name + '/proofingApply/forwardAddBom.load',
-		ok : insert,
-		width : 600,
-		close : dialogClose
-	});
-}
-
-//新增保存
-function insert() {
+		url: web_app.name + '/proofingMake/forwardSaveProofingMake.load',
+		title: "修改打样制造单",
+		width: 1000,
+		param:{id:proofingMakeId},
+		ok: function(div){
 			var _self=this;
-	$('#submitDetailForm').ajaxSubmit({
-		url : web_app.name + '/resourceField/saveResourceFiledValue.ajax',
-		param:{},
-		success : function(data) {
-			if (data == "1"){
-				Public.successTip("保存成功！");
-			}
+			$('#submitForm',div).ajaxSubmit({url: web_app.name + '/proofingMake/saveProofingMake.ajax',
+				success : function() {
 					_self.close();
 					reloadGrid();
 				}
 			});
-}
-
-//编辑按钮
-function updateHandler(id) {
-	if (!id) {
-		//获取所选行id
-		id = DataUtil.getUpdateRowId(gridManager);
-		if (!id) {
-			return;
 		}
-	}
-	UICtrl.showAjaxDialog({
-		title: $.i18nProp('更新Bom'),
-		width: 600,
-		url: web_app.name + '/proofingApply/forwardAddBom.load',
-		param: {id: id,resourceTypeId: $('#resourceTypeId').val()},
-		ok: update,
-		close:dialogClose
 	});
 }
 
-//编辑保存
-function update() {
-	var _self=this;
-	$('#submitDetailForm').ajaxSubmit({
-		url : web_app.name + '/proofingApply/updateResourceFiledValue.ajax',
-		success : function(data) {
-			if (data == "1"){
-				Public.successTip("修改成功！");
-			}
-			refreshFlag = true;
-			_self.close();
-			reloadGrid();
+//重写DataUtil的getUpdateRowId函数、它默认取行的id列
+DataUtil.getUpdateRowId = function(gridManager){
+	var result = DataUtil.getUpdateRow(gridManager);
+	if (result){
+		return result.proofingMakeId;
 	}
-	});
+	return result;
 }
 
 //删除按钮
 function deleteHandler() {
 	DataUtil.del({
-		action: 'resourceField/deleteResourceFiledValue.ajax',
-		param:{
-			id:DataUtil.getUpdateRowId(gridManager),
-			resourceTypeId: $('#resourceTypeId').val()
-		},
-		gridManager: gridManager, idFieldName: 'id',
-		onSuccess: function (data) {
-			if (data == "1"){
-				Public.successTip("删除成功！");
-			}
+		action: 'proofingMake/deleteProofingMakeByProofingMakeId.ajax',
+		gridManager: gridManager, idFieldName: 'proofingMakeId',
+		onSuccess: function () {
 			reloadGrid();
 		}
 	});
 }
 
-//值改变刷新BOM
-// function productIdSelectChange(){
-// 	console.log("jiaz")
-// 	$('#productCode_text').on('change', function() {
-// 		// 获取输入框的当前值
-// 		var currentValue = $(this).val();
-// 		console.log("change触发")
-// 		// 打印到控制台
-// 		console.log('Input value changed:', currentValue);
-// 	});
-// 	// $("#productCode_text").change(function () {
-// 	// 	console.log("change触发")
-// 	// 	loadCodeRuleListGrid(this.productId);
-// 	// });
-//  }
-
-/**
- * 流程引擎回调设置打样的id
- * @param value 打样申请的id
- */
-function setId(proofingApplyId) {
-	$("#proofingApplyId").val(proofingApplyId);
-	// 为文件上传控件绑定业务id
-}
-
-/**
- * 流程引擎获取打样申请id的回掉方法。
- * @return 打样申请的id
- */
-function getId() {
-	return $("#proofingApplyId").val() || "";
-}
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.jsp

@@ -69,12 +69,18 @@
     <hr>
     <div><h3>工艺设置</h3></div>
 
+    <div id="technology">
         <div><h4>工艺</h4></div>
         <div id="technologyGrid" style="margin: 2px;"></div>
+    </div>
 
+    <div id="process">
         <div><h4>工序</h4></div>
         <div id="processGrid" style="margin: 2px;"></div>
+    </div>
 
     <div><h4>工序物料</h4></div>
     <div id="processBomGrid" style="margin: 2px;"></div>
+
+
 </div>

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js

@@ -13,9 +13,9 @@ function initializateUI() {
 
 function loadTechnologyListGrid() {
 	var toolbarOptions = UICtrl.getDefaultToolbarOptions({
-		addHandler: function(){
-			addHandler();
-		},
+		// addHandler: function(){
+		// 	addHandler();
+		// },
 		updateHandler: function(){
 			updateHandler();
 		},
@@ -99,7 +99,6 @@ function addHandler(){
 }
 
 function updateHandler(proofingMakeId){
-	debugger
 	if (!proofingMakeId) {
 		console.log(gridManager)
 		//获取所选行id

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.jsp

@@ -24,5 +24,7 @@
                 </div>
         </div>
 </div>
+
+
 </body>
 </html>
\ No newline at end of file

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeDetail.jsp

@@ -30,11 +30,11 @@
             <x:inputC name="proofingApplyProductNo"  readonly="true"   label="产品代号"  maxLength="32" labelCol="2" fieldCol="2"/>
             <x:inputC name="proofingType"   readonly="true"  label="打样形式"  labelCol="2" fieldCol="2"/>
 
-            <x:selectC name="page"   label="版面"  dictionary="prodcutLayout" labelCol="2" fieldCol="2"/>
+            <x:inputC name="page"   label="版面" labelCol="2" fieldCol="2"/>
 
             <x:inputC name="proofingApplyAllocationType"   label="分配方式"  maxLength="32" labelCol="2" fieldCol="2"/>
 
-            <x:selectC name="productType"  label="产品类别"  dictionary="productType" labelCol="2" fieldCol="2"/>
+            <x:inputC name="productType"  label="产品类别"   labelCol="2" fieldCol="2"/>
 
             <x:inputC name="proofingApplySurfaceTreatment"  readonly="true"   label="表面处理"  maxLength="32" labelCol="2" fieldCol="2"/>
             <x:inputC name="proofingApplyNgReReason"  readonly="true"   label="NG重新打样原因"  maxLength="32" labelCol="2" fieldCol="2"/>
@@ -52,7 +52,7 @@
             <x:inputC name="proofingApplyTestStandard"   label="申请单状态"  maxLength="32" labelCol="2" fieldCol="2"/>
             <div class="container-fluid">
                 <x:title title="附件上传" name="group"/>
-                <x:fileList bizCode="providerFile" bizId="id" id="DataLibraryList"  isClass="true"/>
+                <x:fileList bizCode="providerFile" bizId="bizId" id="proofingMakeDetail"  isClass="true"/>
             </div>
         </div>
 
@@ -80,7 +80,21 @@
             <x:inputC name="productLayerNum"  required="false" label="样品制造单状态"  maxLength="32" labelCol="2" fieldCol="2"/>
             <x:inputC name="productLayerNum"  required="false" label="是否确认"  maxLength="32" labelCol="2" fieldCol="2"/>
         </div>
+        <div><h3>排版参数</h3></div>
+        <div class="hg-form-cols" >
+             <x:inputC name="modulus" required="false" label="模数"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="rowNum"  required="false" label="列"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="columnNum"  required="false" label="行"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="contactNum"  required="false" label="搭版数"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="rowDoubleBlade"  required="false" label="列双刀位(mm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="columnDoubleBlade"  required="false" label="行双刀位(mm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="dispatchMultiple"  required="false" label="派工倍数"  maxLength="32" labelCol="2" fieldCol="2"/>
 
+            <x:inputC name="sheetLength"  required="false" label="印张长度(cm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="sheetWidth"  required="false" label="印张宽度(mm)"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="productLayerNum"  required="false" label="印刷正面颜色"  maxLength="32" labelCol="2" fieldCol="2"/>
+            <x:inputC name="productLayerNum"  required="false" label="印刷反面颜色"  maxLength="32" labelCol="2" fieldCol="2"/>
+        </div>
     </form>
 
 </div>

topsun/src/main/java/com/huigou/topsun/product/repository/ProductPublishedConfRepository.java

@@ -9,4 +9,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * @Description:
  */
 public interface ProductPublishedConfRepository extends JpaRepository<ProductPublishedConf,String> {
+
+    ProductPublishedConf getProductPublishedConfByProductId(String productId);
 }

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java

@@ -7,6 +7,9 @@ import com.huigou.topsun.proofing.domain.model.ProofingApply;
 import com.huigou.topsun.proofing.domain.vo.BomVo;
 
 import com.huigou.topsun.proofing.service.BomService;
+import com.huigou.topsun.technology.application.TechnologyApplication;
+import com.huigou.topsun.technology.application.TechnologyProcessApplication;
+import com.huigou.topsun.technology.domain.model.Technology;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.client.CommonController;
@@ -17,6 +20,7 @@ import com.huigou.util.SDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,8 +37,17 @@ public class ProofingApplyController extends CommonController {
     private BomService bomService;
     @Autowired
     ProofingApplyApplication proofingApplyApplication;
+    @Autowired
+    TechnologyApplication technologyApplication;
 
+    @Resource
+    private TechnologyProcessApplication technologyProcessApplication;
 
+    public String slicedTechnologyProcessList(){
+        SDO sdo = this.getSDO();
+        String technologyId = sdo.getString("technologyId");
+        return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
+    }
     /**
      * 打样表单页
      * @return
@@ -53,19 +66,13 @@ public class ProofingApplyController extends CommonController {
         return forward("proofingApply",proofingApply);
     }
 
-    public String forwardAddBom(){
-        //如果有id的话就带参数过去
+    public String slicedTechnologyList(){
         SDO sdo = this.getSDO();
-        String id = sdo.getId();
-//        BomVo bom = bomService.getBomVoById(Long.valueOf(id));
-        return forward("BomDetail");
-    }
-
-    public String addProofingApply(){
-        SDO sdo = this.getSDO();
-//        ResourceTypeVo resourceTypeVo = sdo.toObject(ResourceTypeVo.class);
-//        sampleService.getProductNoList();
-        return toResult(1);
+        String productId = sdo.getString("productId");
+        List<Technology> allByProduct= technologyApplication.findAllByProductId(productId);
+        Map<String,Object> map =new HashMap();
+        map.put("Rows",allByProduct);
+        return toResult(map);
     }
 
 

topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java

@@ -48,8 +48,11 @@ public class ProofingMakeController extends CommonController {
         return toResult(map);
     }
 
-    //跳转打样编辑页
+    /**
+     *    跳转打样编辑页
+     */
     public String forwardSaveProofingMake(){
+        this.putAttribute("bizId", "ProofingMakeId");
         //如果有id的话就带参数过去
         SDO sdo = this.getSDO();
         String id = sdo.getId();

topsun/src/main/java/com/huigou/topsun/proofing/domain/model/WorkInstrcutionApply.java

+package com.huigou.topsun.proofing.domain.model;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.Data;
+
+/**
+ * 作业指导申请书
+ * @TableName work_instrcution_apply
+ */
+@Table(name="work_instrcution_apply")
+@Data
+public class WorkInstrcutionApply implements Serializable {
+    /**
+     * 作业指导申请书id
+     */
+    @Id
+    @Column(name = "work_instrcution_apply_id")
+    private String workInstrcutionApplyId;
+
+    /**
+     * 打样制作单id
+     */
+    @Column(name = "proofing_make_id")
+    private String proofingMakeId;
+
+    /**
+     * 规格书编号
+     */
+    @Column(name = "specification_no")
+    private String specificationNo;
+
+    /**
+     * 换算值
+     */
+    @Column(name = "matrixing_value")
+    private Integer matrixingValue;
+
+    /**
+     * 尺码组
+     */
+    @Column(name = "size_group")
+    private String sizeGroup;
+
+    /**
+     * 是否禁用
+     */
+    @Column(name = "is_disable")
+    private String isDisable;
+
+    /**
+     * 是否创建新规格书
+     */
+    @Column(name = "is_new_specification")
+    private String isNewSpecification;
+
+    /**
+     * 是否要鞋图
+     */
+    @Column(name = "is_shoe_pattern")
+    private String isShoePattern;
+
+    /**
+     * 是否附样品
+     */
+    @Column(name = "is_attached_sample")
+    private String isAttachedSample;
+
+    /**
+     * 是否为唯一码产品
+     */
+    @Column(name = "is_only_code")
+    private String isOnlyCode;
+
+    /**
+     * 是否不考虑形体配色
+     */
+    @Column(name = "is_body_color")
+    private String isBodyColor;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/ProofingMakeVo.java

 package com.huigou.topsun.proofing.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.huigou.data.domain.model.FlowBillAbstractEntity;
 import lombok.Data;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -188,6 +191,65 @@ public class ProofingMakeVo{
     @Column(name = "die_board_num")
     private Integer dieBoardNum;
 
+    //产品打样排版参数方面字段
+    /**
+     * 模数
+     */
+    @Column(name = "modulus")
+    private Integer modulus;
+
+    /**
+     * 行数
+     */
+    @Column(name = "row_num")
+    private Integer rowNum;
+
+    /**
+     * 列数
+     */
+    @Column(name = "column_num")
+    private Integer columnNum;
+
+    /**
+     * 搭版数
+     */
+    @Column(name = "contact_num")
+    private Integer contactNum;
+
+    /**
+     * 行双刀位(单位mm)
+     */
+    @Column(name = "row_double_blade")
+    private Double rowDoubleBlade;
 
+    /**
+     * 列双刀位(单位mm)
+     */
+    @Column(name = "column_double_blade")
+    private Double columnDoubleBlade;
+
+    /**
+     * 派工倍数
+     */
+    @Column(name = "dispatch_multiple")
+    private Integer dispatchMultiple;
+
+    /**
+     * 印张长度(单位cm)
+     */
+    @Column(name = "sheet_length")
+    private Double sheetLength;
+
+    /**
+     * 印张宽度(单位cm)
+     */
+    @Column(name = "sheet_width")
+    private Double sheetWidth;
+
+    /**
+     * 产品印张设置(product_sheet_conf)
+     */
+    @Column(name = "product_sheet_conf")
+    private String productSheetConf;
 
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/domain/vo/WorkInstrcutionApplyVo.java

+package com.huigou.topsun.proofing.domain.vo;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 作业指导申请书
+ * @TableName work_instrcution_apply
+ */
+@Table(name="work_instrcution_apply")
+@Data
+public class WorkInstrcutionApplyVo implements Serializable {
+    /**
+     * 作业指导申请书id
+     */
+    @Id
+    @Column(name = "work_instrcution_apply_id")
+    private String workInstrcutionApplyId;
+
+    /**
+     * 打样制作单id
+     */
+    @Column(name = "proofing_make_id")
+    private String proofingMakeId;
+
+    /**
+     * 产品id
+     */
+    @Column(name = "product_id")
+    private String productId;
+
+
+
+    /**
+     * 规格书编号
+     */
+    @Column(name = "specification_no")
+    private String specificationNo;
+
+    /**
+     * 换算值
+     */
+    @Column(name = "matrixing_value")
+    private Integer matrixingValue;
+
+    /**
+     * 尺码组
+     */
+    @Column(name = "size_group")
+    private String sizeGroup;
+
+    /**
+     * 是否禁用
+     */
+    @Column(name = "is_disable")
+    private String isDisable;
+
+    /**
+     * 是否创建新规格书
+     */
+    @Column(name = "is_new_specification")
+    private String isNewSpecification;
+
+    /**
+     * 是否要鞋图
+     */
+    @Column(name = "is_shoe_pattern")
+    private String isShoePattern;
+
+    /**
+     * 是否附样品
+     */
+    @Column(name = "is_attached_sample")
+    private String isAttachedSample;
+
+    /**
+     * 是否为唯一码产品
+     */
+    @Column(name = "is_only_code")
+    private String isOnlyCode;
+
+    /**
+     * 是否不考虑形体配色
+     */
+    @Column(name = "is_body_color")
+    private String isBodyColor;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/service/impl/ProofingMakeServiceImpl.java

 package com.huigou.topsun.proofing.service.impl;
 
 import com.huigou.topsun.product.domain.ProductLooked;
+import com.huigou.topsun.product.domain.ProductPublishedConf;
 import com.huigou.topsun.product.repository.ProductLookedRepository;
+import com.huigou.topsun.product.repository.ProductPublishedConfRepository;
 import com.huigou.topsun.proofing.domain.model.ProofingApply;
 import com.huigou.topsun.proofing.domain.model.ProofingMake;
 import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
@@ -27,6 +29,9 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
     ProofingApplyRepository proofingApplyRepository;
     @Autowired
     ProductLookedRepository productLookedRepository;
+    @Autowired
+    ProductPublishedConfRepository productPublishedConfRepository;
+
 
 
     public List<ProofingMakeVo> getProofingMakeVoList(){
@@ -34,6 +39,7 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
         return makeAll.stream().map(proofingMake -> {
                     ProofingApply proofingApply = proofingApplyRepository.findOne(proofingMake.getProofingApplyId());
                     ProductLooked productLooked = productLookedRepository.getProductLookedByProductId(proofingApply.getProductId());
+//                    ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
                     return this.getProofingMakeVo(proofingMake,proofingApply,productLooked);
                 })
                 .collect(Collectors.toList());
@@ -44,7 +50,8 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
         ProofingMake proofingMake = proofingMakeRepository.findOne(proofingMakeId);
         ProofingApply proofingApply = proofingApplyRepository.findOne(proofingMake.getProofingApplyId());
         ProductLooked productLooked = productLookedRepository.getProductLookedByProductId(proofingApply.getProductId());
-        return this.getProofingMakeVo(proofingApply,proofingMake,productLooked);
+        ProductPublishedConf productPublishedConf = productPublishedConfRepository.getProductPublishedConfByProductId(proofingApply.getProductId());
+        return this.getProofingMakeVo(proofingApply,proofingMake,productLooked,productPublishedConf);
     }
 
     /**
@@ -67,8 +74,6 @@ public class ProofingMakeServiceImpl implements ProofingMakeService {
 
     /**
      *   生成ProofingMakeVo类
-//     * @param proofingMake
-//     * @param proofingApply
      * @return 填充过数据后的ProofingMakeVo
      */
     public ProofingMakeVo getProofingMakeVo(Object... objs){

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

@@ -5,7 +5,6 @@ import com.huigou.topsun.technology.domain.model.Technology;
 import com.huigou.topsun.technology.domain.query.TechnologyQueryRequest;
 import com.huigou.topsun.technology.vo.TechnologyVo;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,4 +25,7 @@ public interface TechnologyApplication {
     void deleteTechnology(List<String> ids);
 
     TechnologyVo findTechnologyByTechnologyIdId(String technologyId);
+
+    List<Technology> findAllByProductId(String productId);
+
 }

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

@@ -71,6 +71,11 @@ public class TechnologyApplicationImpl extends BaseApplication implements Techno
         Technology technology = technologyRepository.findOne(technologyId);
         return TechnologyVo.getTechnologyVo(technology);
     }
+
+    @Override
+    public List<Technology> findAllByProductId(String productId) {
+        return technologyRepository.findAllByProductId(productId);
+    }
 }
 
 

topsun/src/main/java/com/huigou/topsun/technology/repository/TechnologyRepository.java

@@ -3,10 +3,14 @@ package com.huigou.topsun.technology.repository;
 import com.huigou.topsun.technology.domain.model.Technology;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 /**
  * @Auther: xin.lu
  * @Date: 2023/11/22/11:12
  * @Description:
  */
 public interface TechnologyRepository extends JpaRepository<Technology,String> {
+
+    List<Technology> findAllByProductId(String productId);
 }

topsun/src/main/resources/mapper/WorkInstrcutionApplyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="generator.mapper.WorkInstrcutionApplyMapper">
+
+    <resultMap id="BaseResultMap" type="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply">
+            <id property="workInstrcutionApplyId" column="work_instrcution_apply_id" jdbcType="VARCHAR"/>
+            <result property="proofingMakeId" column="proofing_make_id" jdbcType="VARCHAR"/>
+            <result property="specificationNo" column="specification_no" jdbcType="VARCHAR"/>
+            <result property="matrixingValue" column="matrixing_value" jdbcType="INTEGER"/>
+            <result property="sizeGroup" column="size_group" jdbcType="VARCHAR"/>
+            <result property="isDisable" column="is_disable" jdbcType="CHAR"/>
+            <result property="isNewSpecification" column="is_new_specification" jdbcType="CHAR"/>
+            <result property="isShoePattern" column="is_shoe_pattern" jdbcType="CHAR"/>
+            <result property="isAttachedSample" column="is_attached_sample" jdbcType="CHAR"/>
+            <result property="isOnlyCode" column="is_only_code" jdbcType="CHAR"/>
+            <result property="isBodyColor" column="is_body_color" jdbcType="CHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        work_instrcution_apply_id,proofing_make_id,specification_no,
+        matrixing_value,size_group,is_disable,
+        is_new_specification,is_shoe_pattern,is_attached_sample,
+        is_only_code,is_body_color
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from work_instrcution_apply
+        where  work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from work_instrcution_apply
+        where  work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </delete>
+    <insert id="insert" keyColumn="work_instrcution_apply_id" keyProperty="workInstrcutionApplyId" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply" useGeneratedKeys="true">
+        insert into work_instrcution_apply
+        ( work_instrcution_apply_id,proofing_make_id,specification_no
+        ,matrixing_value,size_group,is_disable
+        ,is_new_specification,is_shoe_pattern,is_attached_sample
+        ,is_only_code,is_body_color)
+        values (#{workInstrcutionApplyId,jdbcType=VARCHAR},#{proofingMakeId,jdbcType=VARCHAR},#{specificationNo,jdbcType=VARCHAR}
+        ,#{matrixingValue,jdbcType=INTEGER},#{sizeGroup,jdbcType=VARCHAR},#{isDisable,jdbcType=CHAR}
+        ,#{isNewSpecification,jdbcType=CHAR},#{isShoePattern,jdbcType=CHAR},#{isAttachedSample,jdbcType=CHAR}
+        ,#{isOnlyCode,jdbcType=CHAR},#{isBodyColor,jdbcType=CHAR})
+    </insert>
+    <insert id="insertSelective" keyColumn="work_instrcution_apply_id" keyProperty="workInstrcutionApplyId" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply" useGeneratedKeys="true">
+        insert into work_instrcution_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="workInstrcutionApplyId != null">work_instrcution_apply_id,</if>
+                <if test="proofingMakeId != null">proofing_make_id,</if>
+                <if test="specificationNo != null">specification_no,</if>
+                <if test="matrixingValue != null">matrixing_value,</if>
+                <if test="sizeGroup != null">size_group,</if>
+                <if test="isDisable != null">is_disable,</if>
+                <if test="isNewSpecification != null">is_new_specification,</if>
+                <if test="isShoePattern != null">is_shoe_pattern,</if>
+                <if test="isAttachedSample != null">is_attached_sample,</if>
+                <if test="isOnlyCode != null">is_only_code,</if>
+                <if test="isBodyColor != null">is_body_color,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="workInstrcutionApplyId != null">#{workInstrcutionApplyId,jdbcType=VARCHAR},</if>
+                <if test="proofingMakeId != null">#{proofingMakeId,jdbcType=VARCHAR},</if>
+                <if test="specificationNo != null">#{specificationNo,jdbcType=VARCHAR},</if>
+                <if test="matrixingValue != null">#{matrixingValue,jdbcType=INTEGER},</if>
+                <if test="sizeGroup != null">#{sizeGroup,jdbcType=VARCHAR},</if>
+                <if test="isDisable != null">#{isDisable,jdbcType=CHAR},</if>
+                <if test="isNewSpecification != null">#{isNewSpecification,jdbcType=CHAR},</if>
+                <if test="isShoePattern != null">#{isShoePattern,jdbcType=CHAR},</if>
+                <if test="isAttachedSample != null">#{isAttachedSample,jdbcType=CHAR},</if>
+                <if test="isOnlyCode != null">#{isOnlyCode,jdbcType=CHAR},</if>
+                <if test="isBodyColor != null">#{isBodyColor,jdbcType=CHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply">
+        update work_instrcution_apply
+        <set>
+                <if test="proofingMakeId != null">
+                    proofing_make_id = #{proofingMakeId,jdbcType=VARCHAR},
+                </if>
+                <if test="specificationNo != null">
+                    specification_no = #{specificationNo,jdbcType=VARCHAR},
+                </if>
+                <if test="matrixingValue != null">
+                    matrixing_value = #{matrixingValue,jdbcType=INTEGER},
+                </if>
+                <if test="sizeGroup != null">
+                    size_group = #{sizeGroup,jdbcType=VARCHAR},
+                </if>
+                <if test="isDisable != null">
+                    is_disable = #{isDisable,jdbcType=CHAR},
+                </if>
+                <if test="isNewSpecification != null">
+                    is_new_specification = #{isNewSpecification,jdbcType=CHAR},
+                </if>
+                <if test="isShoePattern != null">
+                    is_shoe_pattern = #{isShoePattern,jdbcType=CHAR},
+                </if>
+                <if test="isAttachedSample != null">
+                    is_attached_sample = #{isAttachedSample,jdbcType=CHAR},
+                </if>
+                <if test="isOnlyCode != null">
+                    is_only_code = #{isOnlyCode,jdbcType=CHAR},
+                </if>
+                <if test="isBodyColor != null">
+                    is_body_color = #{isBodyColor,jdbcType=CHAR},
+                </if>
+        </set>
+        where   work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.huigou.topsun.proofing.domain.model.WorkInstrcutionApply">
+        update work_instrcution_apply
+        set 
+            proofing_make_id =  #{proofingMakeId,jdbcType=VARCHAR},
+            specification_no =  #{specificationNo,jdbcType=VARCHAR},
+            matrixing_value =  #{matrixingValue,jdbcType=INTEGER},
+            size_group =  #{sizeGroup,jdbcType=VARCHAR},
+            is_disable =  #{isDisable,jdbcType=CHAR},
+            is_new_specification =  #{isNewSpecification,jdbcType=CHAR},
+            is_shoe_pattern =  #{isShoePattern,jdbcType=CHAR},
+            is_attached_sample =  #{isAttachedSample,jdbcType=CHAR},
+            is_only_code =  #{isOnlyCode,jdbcType=CHAR},
+            is_body_color =  #{isBodyColor,jdbcType=CHAR}
+        where   work_instrcution_apply_id = #{workInstrcutionApplyId,jdbcType=VARCHAR} 
+    </update>
+</mapper>