Skip to content

T
topsun-bpm
Commit 0b97458a authored by 王航's avatar 王航
Browse files
Options

制造详情回显

parent 052ff6c4
Show whitespace changes
Inline Side-by-side
Showing with 292 additions and 319 deletions
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingApply.js
View file @ 0b97458a
......@@ -9,7 +9,7 @@ function initialize(){
//若是作为详情页，则初始化bom
if($("#productId").val()!=null&&$("#productId").val()!=""){
// ajaxRenderDataGoForm({proofingApplyNo:$("#proofingApplyNo").val()});
showTable($("#proofingApplyId").val());
showTable({proofingApplyId:$("#proofingApplyId").val()});
}
}
......
topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMake.js
View file @ 0b97458a
......@@ -19,8 +19,8 @@ function initialize() {
ajaxRenderDataGoForm(proofingApplyNo);
}
if (productId != null && productId !== '') {
showTechnologyTable(productId);
// showTable();
// showTechnologyTable(productId);
showTable({proofingMakeId:$("#proofingMakeId").val()});
}
$("#formButton").hide();
}
......
topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js
View file @ 0b97458a
......@@ -158,9 +158,56 @@ function loadProofingApplyGrid(obj) {
* 获取工艺工序等数据生成表格
* @param proofingApplyId
*/
function showTable(proofingApplyId) {
// async function showTable(params) {
// isDetail = true;
//
// // 根据传入的参数确定使用哪个ID
// let key = Object.keys(params)[0]; // 获取传入对象的第一个key
// let value = params[key]; // 获取对应的value
//
// // 根据key来确定是"apply"还是"make"
// let isApply = key.includes("Apply");
// let isMake = key.includes("Make");
//
// if (!(isApply || isMake)) {
// throw new Error("Invalid parameter. Expected keys: 'proofingApplyId' or 'proofingMakeId'");
// }
//
// technologyObj.parms = { [key]: value };
//
// try {
// // 等待loadProofingApplyGrid执行完毕
// await loadProofingApplyGrid(technologyObj);
//
// let technologyResult = DataUtil.getGridData({
// gridManager: technologyObj.gridManager,
// isAllData: true
// });
// let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
// processObj.parms = { proofingApplyTechnologyId: proofingApplyTechnologyId };
//
// if (processObj.gridManager != null) {
// await reloadGrid(processObj);
// } else {
// await loadProofingApplyGrid(processObj);
// }
// } catch (error) {
// console.error("Error in loadProofingApplyGrid or its Promise:", error);
// }
// }
function showTable(params) {
isDetail=true;
technologyObj.parms = {proofingApplyId: proofingApplyId}
// 根据传入的参数确定使用哪个ID
let key = Object.keys(params)[0]; // 获取传入对象的第一个key
let value = params[key]; // 获取对应的value
// 根据key来确定是"apply"还是"make"
// let isApply = key.includes("Apply");
let a=key.includes("Apply")?"proofingApply":"proofingMake";
// technologyObj.parms = {proofingApplyId: proofingApplyId}
technologyObj.parms = { [a+"Id"]: value };
let promise = new Promise(function(resolve, reject) {
if (technologyObj.gridManager != null) {
reloadGrid(technologyObj);
......@@ -177,9 +224,10 @@ function showTable(proofingApplyId) {
gridManager: technologyObj.gridManager,
isAllData: true
});
let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
processObj.parms = {proofingApplyTechnologyId: proofingApplyTechnologyId}
// let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
// processObj.parms = {proofingApplyTechnologyId: proofingApplyTechnologyId}
processObj.parms = {[a+"TechnologyId"]: technologyId}
if (processObj.gridManager != null) {
reloadGrid(processObj);
} else {
......@@ -188,31 +236,49 @@ function showTable(proofingApplyId) {
});
}
// function showTable(proofingApplyId){
// // offEvent();
// debugger
// technologyObj.parms = {proofingApplyId: proofingApplyId}
// if(technologyObj.gridManager!=null) {
// reloadGrid(technologyObj);
// }else{
// loadProofingApplyGrid(technologyObj);
// }
// setTimeout(function() {
//
// let technologyResult = DataUtil.getGridData({
// gridManager: technologyObj.gridManager,
// isAllData: true
// });
// let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
// processObj.parms = {proofingApplyTechnologyId: proofingApplyTechnologyId}
//
// if (processObj.gridManager != null) {
// reloadGrid(processObj);
// } else {
// loadProofingApplyGrid(processObj);
// }
// },1000)
// }
function showTable1(params){
debugger
isDetail = true;
// 根据传入的参数确定使用哪个ID
let key = Object.keys(params)[0]; // 获取传入对象的第一个key
let value = params[key]; // 获取对应的value
// 根据key来确定是"apply"还是"make"
// let isApply = key.includes("Apply");
let a=key.includes("Apply")?"proofingApply":"proofingMake";
//
// let isMake = key.includes("Make");
//
// if (!(isApply || isMake)) {
// throw new Error("Invalid parameter. Expected keys: 'proofingApplyId' or 'proofingMakeId'");
// }
technologyObj.parms = { [a+"Id"]: value };
//technologyObj.parms = {proofingApplyId: proofingApplyId}
if(technologyObj.gridManager!=null) {
reloadGrid(technologyObj);
}else{
loadProofingApplyGrid(technologyObj);
}
setTimeout(function() {
let technologyResult = DataUtil.getGridData({
gridManager: technologyObj.gridManager,
isAllData: true
});
// let proofingApplyTechnologyId = technologyResult.length > 0 ? technologyResult[0].proofingApplyTechnologyId : -1;
let technologyId = technologyResult.length > 0 ? technologyResult[0][a+"TechnologyId"] : -1;
processObj.parms = {[a]: technologyId}
if (processObj.gridManager != null) {
reloadGrid(processObj);
} else {
loadProofingApplyGrid(processObj);
}
},1000)
}
//展示工艺表格
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyProcessApplication.java
View file @ 0b97458a
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import java.util.Map;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingApplyTechnologyApplication.java
View file @ 0b97458a
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingApplyTechnologyQueryRequest;
import java.util.Map;
......@@ -10,6 +9,6 @@ public interface ProofingApplyTechnologyApplication {
String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingApply.xml";
Map<String, Object> slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest query);
Map<String, Object> slicedProofingApplyTechnology(ProofingApplyTechnologyQueryRequest query);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingMakeProcessApplication.java
View file @ 0b97458a
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingMakeProcessQueryRequest;
import java.util.Map;
......@@ -8,5 +8,5 @@ public interface ProofingMakeProcessApplication {
String QUERY_XML_FILE_PATH = "config/topsun/proofing/proofingMake.xml";
Map<String, Object> slicedProofingMakeProcess(ProofingApplyProcessQueryRequest query);
Map<String, Object> slicedProofingMakeProcess(ProofingMakeProcessQueryRequest query);
}
topsun/src/main/java/com/huigou/topsun/proofing/application/ProofingMakeTechnologyApplication.java
View file @ 0b97458a
package com.huigou.topsun.proofing.application;
import com.huigou.topsun.proofing.domain.query.ProofingMakeTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import java.util.Map;
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingApplyTechnologyApplicationImpl.java
View file @ 0b97458a
......@@ -2,8 +2,7 @@ package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingApplyTechnologyApplication;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingApplyTechnologyQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
......@@ -14,7 +13,7 @@ public class ProofingApplyTechnologyApplicationImpl extends BaseApplication imp
@Override
public Map<String, Object> slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest query) {
public Map<String, Object> slicedProofingApplyTechnology(ProofingApplyTechnologyQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProofingApplyTechnology");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
......
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeProcessApplicationImpl.java 0 → 100644
View file @ 0b97458a
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingApplyProcessApplication;
import com.huigou.topsun.proofing.application.ProofingMakeProcessApplication;
import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingMakeProcessQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service
public class ProofingMakeProcessApplicationImpl extends BaseApplication implements ProofingMakeProcessApplication {
@Override
public Map<String, Object> slicedProofingMakeProcess(ProofingMakeProcessQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProofingMakeProcess");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
}
topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeTechnologyApplicationImpl.java 0 → 100644
View file @ 0b97458a
package com.huigou.topsun.proofing.application.impl;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.proofing.application.ProofingApplyTechnologyApplication;
import com.huigou.topsun.proofing.application.ProofingMakeTechnologyApplication;
import com.huigou.topsun.proofing.domain.query.ProofingMakeTechnologyQueryRequest;
import com.huigou.uasp.bmp.common.application.BaseApplication;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service
public class ProofingMakeTechnologyApplicationImpl extends BaseApplication implements ProofingMakeTechnologyApplication {
@Override
public Map<String, Object> slicedProofingMakeTechnology(ProofingMakeTechnologyQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedProofingMakeTechnology");
return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
}
}
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingApplyController.java
View file @ 0b97458a
......@@ -4,16 +4,11 @@ import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.product.application.ProductLookedApplication;
import com.huigou.topsun.product.domain.ProductLooked;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.application.*;
import com.huigou.topsun.proofing.application.ProofingApplyLookedApplication;
import com.huigou.topsun.proofing.application.ProofingApplyProcessApplication;
import com.huigou.topsun.proofing.application.ProofingApplyTechnologyApplication;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyBaseInfo;
import com.huigou.topsun.proofing.domain.model.proofingApply.ProofingApplyLooked;
import com.huigou.topsun.proofing.domain.query.ProofingApplyProcessQueryRequest;
import com.huigou.topsun.proofing.domain.query.ProofingApplyQuery;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.query.*;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyBaseInfoVo;
import com.huigou.topsun.technology.application.TechnologyApplication;
import com.huigou.topsun.technology.application.TechnologyProcessApplication;
......@@ -51,6 +46,10 @@ public class ProofingApplyController extends CommonController {
ProofingApplyTechnologyApplication proofingApplyTechnologyApplication;
@Autowired
ProofingApplyProcessApplication proofingApplyProcessApplication;
@Autowired
ProofingMakeTechnologyApplication proofingMakeTechnologyApplication;
@Autowired
ProofingMakeProcessApplication proofingMakeProcessApplication;
/**
* 打样申请详情
......@@ -120,13 +119,16 @@ public class ProofingApplyController extends CommonController {
public String slicedTechnologyList(){
SDO sdo = this.getSDO();
TechnologyQueryRequest queryRequest = sdo.toQueryRequest(TechnologyQueryRequest.class);
proofingApplyTechnologyQueryRequest proofingApplyTechnologyQueryRequest = sdo.toQueryRequest(proofingApplyTechnologyQueryRequest.class);
ProofingApplyTechnologyQueryRequest proofingApplyTechnologyQueryRequest = sdo.toQueryRequest(ProofingApplyTechnologyQueryRequest.class);
ProofingMakeTechnologyQueryRequest proofingMakeTechnologyQueryRequest = sdo.toQueryRequest(ProofingMakeTechnologyQueryRequest.class);
Map<String, Object> map = new HashMap<>();
//判断需要展示产品工艺还是打样表中工艺
if(proofingApplyTechnologyQueryRequest.getProofingApplyId()!=null&&!proofingApplyTechnologyQueryRequest.getProofingApplyId().equals("")){
map = proofingApplyTechnologyApplication.slicedProofingApplyTechnology(proofingApplyTechnologyQueryRequest);
}else if(queryRequest.getProductId()!=null&&!queryRequest.getProductId().equals("")){
map = technologyApplication.slicedTechnologyList(queryRequest);
}else if(proofingMakeTechnologyQueryRequest.getProofingMakeId()!=null&&!"".equals(proofingMakeTechnologyQueryRequest.getProofingMakeId())){
map=proofingMakeTechnologyApplication.slicedProofingMakeTechnology(proofingMakeTechnologyQueryRequest);
}
return toResult(map);
}
......@@ -140,11 +142,14 @@ public class ProofingApplyController extends CommonController {
SDO sdo = this.getSDO();
String technologyId = sdo.getString("technologyId");
ProofingApplyProcessQueryRequest proofingApplyProcessQueryRequest = sdo.toQueryRequest(ProofingApplyProcessQueryRequest.class);
ProofingMakeProcessQueryRequest proofingMakeProcessQueryRequest = sdo.toQueryRequest(ProofingMakeProcessQueryRequest.class);
//判断需要展示产品工序还是打样表中工序
if(proofingApplyProcessQueryRequest.getProofingApplyTechnologyId()!=null&&!proofingApplyProcessQueryRequest.getProofingApplyTechnologyId().equals("")){
return toResult(proofingApplyProcessApplication.slicedProofingApplyProcess(proofingApplyProcessQueryRequest));
}else if(technologyId!=null&&!technologyId.equals("")){
return packGridDataAndResult(technologyProcessApplication.slicedTechnologyProcessList(technologyId));
}else if(proofingMakeProcessQueryRequest.getProofingMakeTechnologyId()!=null&&!proofingMakeProcessQueryRequest.getProofingMakeTechnologyId().equals("")){
return toResult(proofingMakeProcessApplication.slicedProofingMakeProcess(proofingMakeProcessQueryRequest));
}
return toResult(null);
}
......
topsun/src/main/java/com/huigou/topsun/proofing/controller/ProofingMakeController.java
View file @ 0b97458a
......@@ -4,17 +4,13 @@ package com.huigou.topsun.proofing.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.huigou.topsun.product.application.ProductLookedApplication;
import com.huigou.topsun.proofing.application.ProofingApplyApplication;
import com.huigou.topsun.proofing.application.ProofingApplyTechnologyApplication;
import com.huigou.topsun.proofing.application.ProofingMakeApplication;
import com.huigou.topsun.proofing.domain.model.proofingMake.ProofingMakeBaseInfo;
import com.huigou.topsun.proofing.domain.query.ProofingMakeQueryRequest;
import com.huigou.topsun.proofing.domain.query.proofingApplyTechnologyQueryRequest;
import com.huigou.topsun.proofing.domain.vo.ProofingApplyAndLookedVo;
import com.huigou.topsun.proofing.domain.vo.ProofingMakeVo;
import com.huigou.topsun.proofing.repository.ProofingApplyLookedRepository;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
......
topsun/src/main/java/com/huigou/topsun/proofing/domain/query/proofingApplyTechnologyQueryRequest.java → topsun/src/main/java/com/huigou/topsun/proofing/domain/query/ProofingApplyTechnologyQueryRequest.java
View file @ 0b97458a
......@@ -13,7 +13,7 @@ import java.io.Serializable;
* @TableName proofing_technology
*/
@Data
public class proofingApplyTechnologyQueryRequest extends QueryAbstractRequest {
public class ProofingApplyTechnologyQueryRequest extends QueryAbstractRequest {
/**
* 打样工艺id
*/
......
topsun/target/classes/config/content/easysearch/easy-search-product.xml
View file @ 0b97458a
......@@ -3,12 +3,13 @@
<easy-search name="productCode" desc="产品">
<sql>
select p.product_id,p.product_name,pc.product_category_name,b.brand_code
select p.product_id,p.product_name,p.product_code,pc.product_category_name,b.brand_code
from product p inner join product_category pc on(p.product_category_id=pc.product_category_id)
left join brand b on(b.brand_name=p.brand_name)
</sql>
<field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品名称" title="产品名称" code="productName" width="200" />
<field name="产品编码" title="产品编码" code="productCode" width="200" />
<field name="产品类别" title="产品类别" code="productCategoryName" width="200" />
<field name="品牌客户编号" title="品牌客户编号" code="productCategoryName" width="200" />
<!-- <field name="版面" title="版面" code="productCategoryName" width="200" />-->
......@@ -24,12 +25,52 @@
<field name="产品id" title="产品id" code="productId" width="200" />
</easy-search>
<!-- <easy-search name="productType" desc="产品状态" >-->
<!-- <sql>select pc.* from-->
<!-- product_category pc</sql>-->
<!-- <field name="productCategoryName" title="产品名称" code="productCategoryName" type="hidden" width="300"/>-->
<!-- <field name="productCategoryStatus" title="产品状态" code="productCategoryStatus" width="200"/>-->
<!-- <field name="productCategoryCode" title="产品编码" code="productCategoryCode" type="hidden" width="300"/>-->
<!-- <field name="productCategoryId" code="productCategoryId" type='hidden' />-->
<!-- </easy-search>-->
<easy-search name="productDetail" desc="产品详情">
<sql>
SELECT
p.product_name, pc.product_category_name,pl.*,
ppc.modulus,ppc.row_num,ppc.column_num,ppc.contact_num,ppc.row_double_blade,ppc.column_double_blade,ppc.dispatch_multiple,ppc.sheet_length,ppc.sheet_width,ppc.product_sheet_conf,
pl2.product_loss_max,pl2.product_loss_rate,pl2.product_loss_redundance,pl2.product_loss_remark,pl2.customer_name
FROM product p
LEFT JOIN product_category pc ON pc.product_category_id = p.product_category_id
LEFT JOIN product_detail pd ON pd.product_id = p.product_id
LEFT JOIN product_looked pl ON pl.product_id = p.product_id
LEFT JOIN product_published_conf ppc ON ppc.product_id = p.product_id
LEFT JOIN product_loss pl2 ON pl2.product_id = p.product_id
</sql>
<field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品name" title="产品name" code="productName" width="200"/>
<field name="长;单位cm" title="长;单位cm" code="productLength" width="200" type='hidden'/>
<field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" type='hidden'/>
<field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" type='hidden'/>
<field name="厚度;单位mm" title="厚度;单位mm" code="productThick" width="200" type='hidden'/>
<field name="成品克重;单位g" title="成品克重;单位g" code="productWeight" width="200" type='hidden'/>
<field name="角型" title="角型" code="productAngleType" width="200" type='hidden'/>
<field name="孔径" title="孔径" code="productAperture" width="200" type='hidden'/>
<field name="单层厚" title="单层厚" code="productSingleLayer" width="200" type='hidden'/>
<field name="单重" title="单重" code="productSingleWeight" width="200" type='hidden'/>
<field name="层数" title="层数" code="productLayerNum" width="200" type='hidden'/>
<field name="是否防霉" title="是否防霉(is_open)" code="productMould" width="200" type='hidden'/>
<field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/>
<field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/>
<field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
<field name="采购单位" title="采购单位" code="productBuyUnit" width="200" type='hidden'/>
<field name="排版参数配置id" title="排版参数配置id" code="productPublishedConfId" width="200" type='hidden'/>
<field name="模数" title="模数" code="modulus" width="200" type='hidden'/>
<field name="行数" title="行数" code="rowNum" width="200" type='hidden'/>
<field name="列数" title="列数" code="columnNum" width="200" type='hidden'/>
<field name="搭版数" title="搭版数" code="contactNum" width="200" type='hidden'/>
<field name="行双刀位(单位mm)" title="行双刀位(单位mm)" code="rowDoubleBlade" width="200" type='hidden'/>
<field name="列双刀位(单位mm)" title="列双刀位(单位mm)" code="columnDoubleBlade" width="200" type='hidden'/>
<field name="派工倍数" title="派工倍数" code="dispatchMultiple" width="200" type='hidden'/>
<field name="印张长度(单位cm)" title="印张长度(单位cm)" code="sheetLength" width="200" type='hidden'/>
<field name="印张宽度(单位cm)" title="印张宽度(单位cm)" code="sheetWidth" width="200" type='hidden'/>
<field name="产品印张设置" title="客户名称" code="customerName" width="200" type='hidden'/>
<field name="产品印张设置" title="备注信息" code="productLossRemark" width="200" type='hidden'/>
<field name="产品印张设置" title="loss比率" code="productLossRate" width="200" type='hidden'/>
<field name="产品印张设置" title="冗余量" code="productLossRedundance" width="200" type='hidden'/>
<!-- <field name="产品印张设置" title="产品印张设置" code="productLossMax" width="200" />-->
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/target/classes/config/content/easysearch/easy-search-proofing.xml
View file @ 0b97458a
......@@ -2,42 +2,63 @@
<easy-search-mappings>
<easy-search name="proofingApplyCode" desc="订单">
<sql>select p.proofing_apply_no,p.product_id from proofing_apply p</sql>
<sql>
select pa.proofing_apply_no,pa.proofing_apply_id,pa.product_id,p.product_code
from proofing_apply_base_info pa
inner join product p on(pa.product_id=p.product_id)
where pa.proofing_apply_application_status != 2
</sql>
<field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
<field name="产品编号" title="产品编号" code="productId" width="200" />
<field name="申请Id" title="申请Id" code="proofingApplyId" width="200" />
<field name="产品Id" title="产品Id" code="productId" width="200" type="hidden"/>
<field name="产品编号" title="产品编号" code="productCode" width="200" />
</easy-search>
<easy-search name="proofingMakeCode" desc="订单">
<sql>
<!-- SELECT-->
<!-- pm.proofing_make_no,-->
<!-- pm.proofing_make_id,-->
<!-- pa.proofing_apply_no,-->
<!-- p.product_id,-->
<!-- p.product_name,-->
<!-- p.product_type,-->
<!-- p.brand_name,-->
<!-- pd.product_english_name,-->
<!-- pl.store_name-->
<!-- FROM-->
<!-- proofing_make pm-->
<!-- INNER JOIN-->
<!-- proofing_apply_base_info pa ON pm.proofing_apply_id = pa.proofing_apply_id-->
<!-- INNER JOIN-->
<!-- product p ON pa.product_id = p.product_id-->
<!-- LEFT JOIN-->
<!-- product_detail pd ON pd.product_id = p.product_id-->
<!-- LEFT JOIN-->
<!-- product_looked pl ON pl.product_id = p.product_id-->
SELECT
pm.proofing_make_no,
pa.proofing_apply_no,
p.product_id,
p.product_name,
p.product_type,
p.brand_name,
pd.product_english_name,
pl.store_name
pm.proofing_make_id,
pm.product_id,
pm.proofing_make_sample_cn_name,
pm.proofing_make_sample_en_name,
p.product_code
FROM
proofing_make pm
INNER JOIN
proofing_apply pa ON pm.proofing_apply_id = pa.proofing_apply_id
INNER JOIN
product p ON pa.product_id = p.product_id
LEFT JOIN
product_detail pd ON pd.product_id = p.product_id
LEFT JOIN
product_looked pl ON pl.product_id = p.product_id
proofing_make_base_info pm
inner join product p on(pm.product_id=p.product_id)
<!-- where pm.proofing_make_application_status ="normal"-->
</sql>
<field name="产品编号" title="产品编号" code="productId" width="200" />
<field name="产品Id" title="产品Id" code="productId" width="200" />
<field name="产品编号" title="产品编号" code="productCode" width="200" />
<field name="制作单号" title="制作单号" code="proofingMakeNo" width="200" />
<field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
<field name="制作id" title="制作id" code="proofingMakeId" width="200" type="hidden"/>
<!-- <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />-->
<!-- <field name="类型" title="类型" code="productType" width="200" type="hidden"/>-->
<!-- <field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/>-->
<field name="名称" title="名称" code="proofingMakeSampleCnName" width="200" type="hidden"/>
<field name="英文名称" title="英文名称" code="proofingMakeSampleEnName" width="200" type="hidden"/>
<!-- <field name="仓库" title="仓库" code="productId" width="200" type="hidden"/>-->
<field name="类型" title="类型" code="productType" width="200" type="hidden"/>
<field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/>
<field name="名称" title="名称" code="productName" width="200" type="hidden"/>
<field name="英文名称" title="英文名称" code="productEnglishName" width="200" type="hidden"/>
<field name="仓库" title="仓库" code="productId" width="200" type="hidden"/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/target/classes/config/topsun/proofing/proofingApply.xml
View file @ 0b97458a
......@@ -3,7 +3,7 @@
<query name="slicedQuery" table="proofing_apply">
<sql-query>
select t.* from proofing_apply t where 1=1
select t.* from proofing_apply_base_info t where 1=1
</sql-query>
<permissions>
<permission column="person_member_id" symbol="half_like" alias="t" kind="personId"/>
......@@ -15,7 +15,6 @@
<query name="queryProofingApplyAndProductQuery" table="proofing_apply">
<sql-query>
select
pa.proofing_apply_id,
pa.proofing_apply_no,
pa.product_id,
pa.customer_id,
......@@ -34,49 +33,28 @@
pa.proofing_apply_ng_re_reason,
pa.proofing_apply_application_status,
pa.proofing_apply_test_standard,
pa.is_output,
pa.is_out,
pa.is_change,
pl.product_looked_id,
pl.product_length,
pl.product_width,
pl.product_height,
pl.product_thick,
pl.product_weight,
pl.product_angle_type,
pl.product_angle,
pl.product_aperture,
pl.product_single_layer,
pl.product_single_weight,
pl.product_layer_num,
pl.product_mould,
pl.product_coding,
pl.product_sys_certification,
pl.store_name,
pl.product_buy_unit,
pl.product_shape,
pl.prodcut_shape_size,
pl.*
FROM
proofing_apply_base_info pa
left join
proofing_apply_looked pl ON pa.proofing_apply_id = pl.proofing_apply_id
where pa.proofing_apply_no=?
</sql-query>
p.product_name,
p.product_status,
p.product_unit,
p.product_sample_code,
p.brand_name,
p.product_type,
</query>
pc.product_category_name
FROM
proofing_apply pa
JOIN
product_looked pl ON pa.product_id = pl.product_id
JOIN
product p ON pa.product_id = p.product_id
JOIN
product_category pc ON p.product_category_id = pc.product_category_id
where pa.id=?
<query name="slicedProofingApplyTechnology" table="proofing_Apply_technology">
<sql-query>
select t.* from proofing_Apply_technology t
</sql-query>
<condition column="proofing_apply_id" name="proofingApplyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedProofingApplyProcess" table="proofing_apply_process">
<sql-query>
select t.* from proofing_apply_process t
</sql-query>
<condition column="proofing_apply_technology_id" name="proofingApplyTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
......
topsun/target/classes/config/topsun/proofing/proofingMake.xml
View file @ 0b97458a
......@@ -4,33 +4,23 @@
<query name="slicedProofingMakeList" table="proofing_apply">
<sql-query>
SELECT
pm.*,
pa.proofing_apply_no,
pa.product_id,
pa.customer_id,
pa.proofing_apply_page_need_time,
pa.proofing_apply_complete_date,
pa.proofing_apply_sample_cn_name,
pa.proofing_apply_sample_en_name,
pa.proofing_apply_sample_version,
pa.proofing_apply_sample_size,
pa.proofing_apply_sample_num,
pa.proofing_apply_output_situation,
pa.proofing_apply_product_no,
pa.proofing_type,
pa.proofing_apply_allocation_type,
pa.proofing_apply_surface_treatment,
pa.proofing_apply_ng_re_reason,
pa.proofing_apply_application_status,
pa.proofing_apply_test_standard,
pa.is_output,
pa.is_out,
pa.is_change
pm.*
FROM
proofing_make pm
JOIN
proofing_apply pa ON pm.proofing_apply_id = pa.proofing_apply_id
proofing_make_base_info pm
</sql-query>
</query>
<query name="slicedProofingMakeTechnology" table="proofing_Make_technology">
<sql-query>
select t.* from proofing_make_technology t
</sql-query>
<condition column="proofing_make_id" name="proofingMakeId" type="java.lang.String" symbol="=" alias="t"/>
</query>
<query name="slicedProofingMakeProcess" table="proofing_make_process">
<sql-query>
select t.* from proofing_make_process t
</sql-query>
<condition column="proofing_make_technology_id" name="proofingMakeTechnologyId" type="java.lang.String" symbol="=" alias="t"/>
</query>
</query-mappings>
\ No newline at end of file
topsun/target/classes/config/topsun/technology/technology.xml
View file @ 0b97458a
......@@ -8,6 +8,7 @@
<condition column="name" name="name" type="java.lang.String" symbol="=" alias="like"/>
<condition column="full_id" name="fullId" type="java.lang.String" symbol="half_like" alias="o"/>
<condition column="rule_kind" name="ruleKind" type="java.lang.String" symbol="=" alias="t"/>
<condition column="product_id" name="productId" symbol="=" alias="t"/>
</query>
<query name="queryTechnologyByProduct" label="根据产品查询工艺">
......
topsun/target/classes/mapper/WorkInstructionMapper.xml deleted 100644 → 0
View file @ 052ff6c4
<?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.WorkInstructionMapper">
<resultMap id="BaseResultMap" type="generator.domain.WorkInstruction">
<id property="workInstructionId" column="work_instruction_id" jdbcType="VARCHAR"/>
<result property="workInstructionApplyId" column="work_instruction_apply_id" jdbcType="VARCHAR"/>
<result property="isBuildBom" column="is_build_bom" jdbcType="VARCHAR"/>
<result property="confirmDate" column="confirm_date" jdbcType="TIMESTAMP"/>
<result property="comfirmPerson" column="comfirm_person" jdbcType="VARCHAR"/>
<result property="isFreeInspection" column="is_free_inspection" jdbcType="VARCHAR"/>
<result property="isNoQualityLoss" column="is_no_quality_loss" jdbcType="VARCHAR"/>
<result property="sampleOrderNo" column="sample_order_no" jdbcType="VARCHAR"/>
<result property="stockNo" column="stock_no" jdbcType="VARCHAR"/>
<result property="stockName" column="stock_name" jdbcType="VARCHAR"/>
<result property="fileNo" column="file_no" jdbcType="VARCHAR"/>
<result property="styleColorMatch" column="style_color_match" jdbcType="VARCHAR"/>
<result property="customerMaterialNo" column="customer_material_no" jdbcType="VARCHAR"/>
<result property="versionNo" column="version_no" jdbcType="VARCHAR"/>
<result property="coefficient" column="coefficient" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
work_instruction_id,work_instruction_apply_id,is_build_bom,
confirm_date,comfirm_person,is_free_inspection,
is_no_quality_loss,sample_order_no,stock_no,
stock_name,file_no,style_color_match,
customer_material_no,version_no,coefficient
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from work_instruction
where work_instruction_id = #{workInstructionId,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from work_instruction
where work_instruction_id = #{workInstructionId,jdbcType=VARCHAR}
</delete>
<insert id="insert" keyColumn="work_instruction_id" keyProperty="workInstructionId" parameterType="generator.domain.WorkInstruction" useGeneratedKeys="true">
insert into work_instruction
( work_instruction_id,work_instruction_apply_id,is_build_bom
,confirm_date,comfirm_person,is_free_inspection
,is_no_quality_loss,sample_order_no,stock_no
,stock_name,file_no,style_color_match
,customer_material_no,version_no,coefficient
)
values (#{workInstructionId,jdbcType=VARCHAR},#{workInstructionApplyId,jdbcType=VARCHAR},#{isBuildBom,jdbcType=VARCHAR}
,#{confirmDate,jdbcType=TIMESTAMP},#{comfirmPerson,jdbcType=VARCHAR},#{isFreeInspection,jdbcType=VARCHAR}
,#{isNoQualityLoss,jdbcType=VARCHAR},#{sampleOrderNo,jdbcType=VARCHAR},#{stockNo,jdbcType=VARCHAR}
,#{stockName,jdbcType=VARCHAR},#{fileNo,jdbcType=VARCHAR},#{styleColorMatch,jdbcType=VARCHAR}
,#{customerMaterialNo,jdbcType=VARCHAR},#{versionNo,jdbcType=VARCHAR},#{coefficient,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" keyColumn="work_instruction_id" keyProperty="workInstructionId" parameterType="generator.domain.WorkInstruction" useGeneratedKeys="true">
insert into work_instruction
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="workInstructionId != null">work_instruction_id,</if>
<if test="workInstructionApplyId != null">work_instruction_apply_id,</if>
<if test="isBuildBom != null">is_build_bom,</if>
<if test="confirmDate != null">confirm_date,</if>
<if test="comfirmPerson != null">comfirm_person,</if>
<if test="isFreeInspection != null">is_free_inspection,</if>
<if test="isNoQualityLoss != null">is_no_quality_loss,</if>
<if test="sampleOrderNo != null">sample_order_no,</if>
<if test="stockNo != null">stock_no,</if>
<if test="stockName != null">stock_name,</if>
<if test="fileNo != null">file_no,</if>
<if test="styleColorMatch != null">style_color_match,</if>
<if test="customerMaterialNo != null">customer_material_no,</if>
<if test="versionNo != null">version_no,</if>
<if test="coefficient != null">coefficient,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workInstructionId != null">#{workInstructionId,jdbcType=VARCHAR},</if>
<if test="workInstructionApplyId != null">#{workInstructionApplyId,jdbcType=VARCHAR},</if>
<if test="isBuildBom != null">#{isBuildBom,jdbcType=VARCHAR},</if>
<if test="confirmDate != null">#{confirmDate,jdbcType=TIMESTAMP},</if>
<if test="comfirmPerson != null">#{comfirmPerson,jdbcType=VARCHAR},</if>
<if test="isFreeInspection != null">#{isFreeInspection,jdbcType=VARCHAR},</if>
<if test="isNoQualityLoss != null">#{isNoQualityLoss,jdbcType=VARCHAR},</if>
<if test="sampleOrderNo != null">#{sampleOrderNo,jdbcType=VARCHAR},</if>
<if test="stockNo != null">#{stockNo,jdbcType=VARCHAR},</if>
<if test="stockName != null">#{stockName,jdbcType=VARCHAR},</if>
<if test="fileNo != null">#{fileNo,jdbcType=VARCHAR},</if>
<if test="styleColorMatch != null">#{styleColorMatch,jdbcType=VARCHAR},</if>
<if test="customerMaterialNo != null">#{customerMaterialNo,jdbcType=VARCHAR},</if>
<if test="versionNo != null">#{versionNo,jdbcType=VARCHAR},</if>
<if test="coefficient != null">#{coefficient,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="generator.domain.WorkInstruction">
update work_instruction
<set>
<if test="workInstructionApplyId != null">
work_instruction_apply_id = #{workInstructionApplyId,jdbcType=VARCHAR},
</if>
<if test="isBuildBom != null">
is_build_bom = #{isBuildBom,jdbcType=VARCHAR},
</if>
<if test="confirmDate != null">
confirm_date = #{confirmDate,jdbcType=TIMESTAMP},
</if>
<if test="comfirmPerson != null">
comfirm_person = #{comfirmPerson,jdbcType=VARCHAR},
</if>
<if test="isFreeInspection != null">
is_free_inspection = #{isFreeInspection,jdbcType=VARCHAR},
</if>
<if test="isNoQualityLoss != null">
is_no_quality_loss = #{isNoQualityLoss,jdbcType=VARCHAR},
</if>
<if test="sampleOrderNo != null">
sample_order_no = #{sampleOrderNo,jdbcType=VARCHAR},
</if>
<if test="stockNo != null">
stock_no = #{stockNo,jdbcType=VARCHAR},
</if>
<if test="stockName != null">
stock_name = #{stockName,jdbcType=VARCHAR},
</if>
<if test="fileNo != null">
file_no = #{fileNo,jdbcType=VARCHAR},
</if>
<if test="styleColorMatch != null">
style_color_match = #{styleColorMatch,jdbcType=VARCHAR},
</if>
<if test="customerMaterialNo != null">
customer_material_no = #{customerMaterialNo,jdbcType=VARCHAR},
</if>
<if test="versionNo != null">
version_no = #{versionNo,jdbcType=VARCHAR},
</if>
<if test="coefficient != null">
coefficient = #{coefficient,jdbcType=VARCHAR},
</if>
</set>
where work_instruction_id = #{workInstructionId,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="generator.domain.WorkInstruction">
update work_instruction
set
work_instruction_apply_id = #{workInstructionApplyId,jdbcType=VARCHAR},
is_build_bom = #{isBuildBom,jdbcType=VARCHAR},
confirm_date = #{confirmDate,jdbcType=TIMESTAMP},
comfirm_person = #{comfirmPerson,jdbcType=VARCHAR},
is_free_inspection = #{isFreeInspection,jdbcType=VARCHAR},
is_no_quality_loss = #{isNoQualityLoss,jdbcType=VARCHAR},
sample_order_no = #{sampleOrderNo,jdbcType=VARCHAR},
stock_no = #{stockNo,jdbcType=VARCHAR},
stock_name = #{stockName,jdbcType=VARCHAR},
file_no = #{fileNo,jdbcType=VARCHAR},
style_color_match = #{styleColorMatch,jdbcType=VARCHAR},
customer_material_no = #{customerMaterialNo,jdbcType=VARCHAR},
version_no = #{versionNo,jdbcType=VARCHAR},
coefficient = #{coefficient,jdbcType=VARCHAR}
where work_instruction_id = #{workInstructionId,jdbcType=VARCHAR}
</update>
</mapper>
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