打样申请流程

.idea/encodings.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
+    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/huigou-xt/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/test/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/test/src/main/resources" charset="UTF-8" />

.idea/misc.xml

@@ -4,6 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$/huigou-xt" />
     <file type="web" url="file://$PROJECT_DIR$/SSRF-xt" />
+    <file type="web" url="file://$PROJECT_DIR$/topsun-xt" />
   </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">

.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/huigou-xt/huigou-xt.iml" filepath="$PROJECT_DIR$/huigou-xt/huigou-xt.iml" />
-      <module fileurl="file://$PROJECT_DIR$/topsun/topsun.iml" filepath="$PROJECT_DIR$/topsun/topsun.iml" />
-      <module fileurl="file://$PROJECT_DIR$/topsun-xt/topsun-xt.iml" filepath="$PROJECT_DIR$/topsun-xt/topsun-xt.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

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

@@ -28,13 +28,19 @@ $(document).ready(function() {
 	initializateUI();
 	loadOrgTreeView();
 	bindQueryEvent();
-	loadProofingApplyGrid(null,bom,"mobTableGrid","forwardProofingApply");//加载BOm
-	loadProofingApplyGrid(null,technology,"technologyGrid","forwardProofingApply");//加载工艺
-	loadProofingApplyGrid(null,process,"processGrid","forwardProofingApply");//加载工序
-	loadProofingApplyGrid(null,processBom,"processBomGrid","forwardProofingApply");//加载物料
+	loadProofingApplyGrid(null,bom,"mobTableGrid","");//加载BOm
+	loadProofingApplyGrid(null,technology,"technologyGrid","");//加载工艺
+	loadProofingApplyGrid(null,process,"processGrid","");//加载工序
+	loadProofingApplyGrid(null,processBom,"processBomGrid","");//加载物料
+	echo("productId");
+	echo("productType")
 });
 
 
+function echo(node){
+	$("#"+node+"_text").val($("#"+node).val())
+}
+
 //工艺、工序、工序物料三级联动
 function test(){
 
@@ -43,6 +49,7 @@ function test(){
 
 function initializateUI() {
 	UICtrl.layout("#layout", {leftWidth: 3});
+
 }
 
 
@@ -110,29 +117,15 @@ function onFolderTreeNodeClick(data) {
 }
 //绑定selectC
 function bindQueryEvent(){
-
-	//
-	// $('#productId').searchbox({
-	// 	type : "product",name : "productCode",
-	// 	onChange:function(value,data){
-	// 		console.log("@"+data.productId)
-	// 		$('#productId').val(data.productId);
-	//
-	// 		console.log($('#productId').val())
-	//
-	// 	}
-	// });
-
 	$('#productId').searchbox({
 		type : "product",name : "productCode",
 		onChange:function(value,data){
 			$('#productId').val(data.productId);
 			console.log($('#productId').val())
-			// loadProofingApplyGrid({id:data.productId},bom,"mobTableGrid","forwardProofingApply");
+			loadProofingApplyGrid({id:data.productId},bom,"mobTableGrid","forwardProofingApply");
 		}
 	});
 
-
 	$('#productType').searchbox({
 		type : "product",name : "productType",
 		onChange:function(value,data){

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

 package com.huigou.topsun.proofing.controller;
 
+import com.huigou.context.Operator;
+import com.huigou.context.OrgUnit;
 import com.huigou.topsun.proofing.application.ProofingApplyApplication;
 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.uasp.annotation.ControllerMapping;
+import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.client.CommonController;
 import com.huigou.uasp.log.annotation.LogInfo;
 import com.huigou.uasp.log.domain.model.LogType;
@@ -25,8 +28,8 @@ public class ProofingApplyController extends CommonController {
     }
 
 
-    @Autowired
-    private BomService bomService;
+//    @Autowired
+//    private BomService bomService;
     @Autowired
     ProofingApplyApplication proofingApplyApplication;
 
@@ -35,21 +38,28 @@ public class ProofingApplyController extends CommonController {
      * @return
      */
     public String forwardProofingApply(){
-        this.putAttribute("processDefinitionKey",proofingApplyApplication .PROCESS_DEFINITION_KEY);
+        this.putAttribute("processDefinitionKey",ProofingApplyApplication.PROCESS_DEFINITION_KEY);
         String applicationNo="测试单号";
         this.putAttribute("procUnitId", "Apply");
-       this.putAttribute("proofingApplyNo",applicationNo);
-        return forward("proofingApply");
-    }
 
-    public String forwardAddBom(){
-        //如果有id的话就带参数过去
-        SDO sdo = this.getSDO();
-        String id = sdo.getId();
-        List<BomVo> bom = bomService.getBomVoByProductId(id);
-        return forward("BomDetail",bom);
+
+
+        ProofingApply proofingApply = new ProofingApply();
+        proofingApply.setProofingApplyNo(applicationNo);
+        proofingApply.setStatusId(BizBillStatus.APPLYING.getId());
+        Operator operator = getOperator();
+        proofingApply.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
+        return forward("proofingApply",proofingApply);
     }
 
+//    public String forwardAddBom(){
+//        //如果有id的话就带参数过去
+//        SDO sdo = this.getSDO();
+//        String id = sdo.getId();
+//        List<BomVo> bom = bomService.getBomVoByProductId(id);
+//        return forward("BomDetail",bom);
+//    }
+
     public String addProofingApply(){
         SDO sdo = this.getSDO();
 //        ResourceTypeVo resourceTypeVo = sdo.toObject(ResourceTypeVo.class);
@@ -58,15 +68,15 @@ public class ProofingApplyController extends CommonController {
     }
 
 
-    @LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询BOM表")
-    public String slicedQueryBomRule() {
-        SDO sdo = this.getSDO();
-        String id = sdo.getId();
-        List<BomVo> bom = bomService.getBomVoByProductId(id);
-        Map<String,Object> map =new HashMap();
-        map.put("Rows",bom);
-        return toResult(map);
-    }
+//    @LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询BOM表")
+//    public String slicedQueryBomRule() {
+//        SDO sdo = this.getSDO();
+//        String id = sdo.getId();
+////        List<BomVo> bom = bomService.getBomVoByProductId(id);
+//        Map<String,Object> map =new HashMap();
+//        map.put("Rows",bom);
+//        return toResult(map);
+//    }
 
     public String updateResourceFiledValue(){
         SDO sdo = this.getSDO();
@@ -83,6 +93,7 @@ public class ProofingApplyController extends CommonController {
         SDO sdo = this.getSDO();
         String id = sdo.getBizId();
         ProofingApply proofingApply = proofingApplyApplication.loadProofingApplyById(id);
+
         return forward("proofingApply", proofingApply);
     }
 }