Commit 997e1fde authored by wanghang's avatar wanghang

打样制造表格展示

parent db374b8b
......@@ -124,6 +124,7 @@ function dialogClose(){
//添加按钮
function addHandler() {
debugger
// var resourceTypeId=$('#resourceTypeId').val();
// if (Public.isBlank(resourceTypeId)) {
// Public.tip('请选择资源!');
......@@ -131,7 +132,7 @@ function addHandler() {
// }
UICtrl.showAjaxDialog({
title: $.i18nProp('添加BOM'),
url : web_app.name + '/proofingApply/forwardAddBom.load',
url : web_app.name + '/proofingMake/forwardSaveProofingMake.load',
//init:initDetailDialog,
// param:{resourceTypeId:resourceTypeId},
ok : insert,
......
......@@ -2,7 +2,6 @@ package com.huigou.topsun.proofing.controller;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.product.application.ProductLookedService;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.domain.model.ProofingApply;
import com.huigou.topsun.proofing.domain.vo.BomVo;
......@@ -34,8 +33,7 @@ public class ProofingApplyController extends CommonController {
private BomService bomService;
@Autowired
ProofingApplyApplication proofingApplyApplication;
@Autowired
ProductLookedService productLookedService;
/**
* 打样表单页
......@@ -59,8 +57,8 @@ public class ProofingApplyController extends CommonController {
//如果有id的话就带参数过去
SDO sdo = this.getSDO();
String id = sdo.getId();
BomVo bom = bomService.getBomVoById(Long.valueOf(id));
return forward("BomDetail",bom);
// BomVo bom = bomService.getBomVoById(Long.valueOf(id));
return forward("BomDetail");
}
public String addProofingApply(){
......@@ -81,11 +79,6 @@ public class ProofingApplyController extends CommonController {
return toResult(map);
}
public String updateResourceFiledValue(){
SDO sdo = this.getSDO();
Map<String, Object> map = sdo.getProperties();
return toResult(null);
}
/**
......
package com.huigou.topsun.proofing.controller;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.product.application.ProductLookedService;
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.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.ProofingMakeRepository;
import com.huigou.topsun.proofing.service.BomService;
......@@ -46,13 +41,17 @@ public class ProofingMakeController extends CommonController {
@LogInfo(logType = LogType.BIZ, subType = "", operaionType = OperationType.QUERY, description = "分页查询打样制造表")
public String slicedQueryProofingMake() {
// SDO sdo = this.getSDO();
// String id = sdo.getId();
List<ProofingMakeVo> proofingMakeList = proofingMakeService.getProofingMakeList();
Map<String,Object> map =new HashMap();
map.put("Rows",proofingMakeList);
return toResult(map);
}
public String forwardSaveProofingMake(){
//如果有id的话就带参数过去
SDO sdo = this.getSDO();
String id = sdo.getId();
return forward("proofingMakeDetail");
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment