Skip to content

H
hp-smart
Commit c4e7d5a0 by 宋祥
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC003.java
#	src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003.java
#	src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
#	src/main/webapp/HP/SC/HPSC003.jsp
parents 05fd0277 9e68021e
Showing with 892 additions and 145 deletions
src/main/java/com/baosight/hpjx/common/DdynamicEnum.java
...@@ -64,7 +64,6 @@ public enum DdynamicEnum { ...@@ -64,7 +64,6 @@ public enum DdynamicEnum {
*/ */
INVENT_PRDT_NAME_BLOCK_ID("invent_prdt_name_block_id","id","inventCode","inventName","HPPZ006.queryPrdtComboBoxAll"), INVENT_PRDT_NAME_BLOCK_ID("invent_prdt_name_block_id","id","inventCode","inventName","HPPZ006.queryPrdtComboBoxAll"),
/** /**
* 模块：存货档案（规格） * 模块：存货档案（规格）
* 用途：存货档案下拉框 * 用途：存货档案下拉框
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003.java
...@@ -88,9 +88,15 @@ public class ServiceHPKC003 extends ServiceBase { ...@@ -88,9 +88,15 @@ public class ServiceHPKC003 extends ServiceBase {
fKc003.setInventName(HPPZTools.getPz004ByCode(fKc003.getInventCode()).getInventName()); fKc003.setInventName(HPPZTools.getPz004ByCode(fKc003.getInventCode()).getInventName());
// 生成入库单号 // 生成入库单号
fKc003.setProdNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC003_PROD_NO)); fKc003.setProdNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC003_PROD_NO));
DaoUtils.insert(HPKC003.INSERT, fKc003);
// fKc003.setPrdtCode(HPPZTools.checkAndSavePZ04(fKc003.getPrdtType(),fKc003.getPrdtName()));
// fKc003.setPartCode(HPPZTools.checkAndSavePZ04(fKc003.getPartType(),fKc003.getPartName()));
DaoUtils.insert("HPKC003.insert", fKc003);
//同步生产计划 //同步生产计划
DaoUtils.update(HPSC004.UPDATE,this.synchronousPlan(fKc003)); DaoUtils.update("HPSC004.update",this.synchronousPlan(fKc003));
// 修改库存 // 修改库存
HPKCTools.updateStock(fKc003.getWhCode(), fKc003.getInventRecordId(), fKc003.getAmount(), HPKCTools.updateStock(fKc003.getWhCode(), fKc003.getInventRecordId(), fKc003.getAmount(),
fKc003.getWeight()); fKc003.getWeight());
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC009.java
...@@ -4,9 +4,9 @@ import com.baosight.hpjx.common.DdynamicEnum; ...@@ -4,9 +4,9 @@ import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.constant.HPSqlConstant; import com.baosight.hpjx.hp.constant.HPSqlConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC003;
import com.baosight.hpjx.hp.kc.domain.HPKC001; import com.baosight.hpjx.hp.kc.domain.HPKC001;
import com.baosight.hpjx.hp.kc.domain.HPKC002; import com.baosight.hpjx.hp.kc.domain.HPKC002;
import com.baosight.hpjx.hp.kc.domain.HPKC003;
import com.baosight.hpjx.hp.kc.domain.HPKC004; import com.baosight.hpjx.hp.kc.domain.HPKC004;
import com.baosight.hpjx.hp.kc.domain.HPKC005; import com.baosight.hpjx.hp.kc.domain.HPKC005;
import com.baosight.hpjx.hp.kc.domain.HPKC006; import com.baosight.hpjx.hp.kc.domain.HPKC006;
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ006.xml
...@@ -262,4 +262,5 @@ ...@@ -262,4 +262,5 @@
<include refid="customCondition"/> <include refid="customCondition"/>
ORDER BY ID ORDER BY ID
</select> </select>
</sqlMap> </sqlMap>
src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java
package com.baosight.hpjx.hp.pz.tools; package com.baosight.hpjx.hp.pz.tools;
import com.baosight.eplat.utils.StringUtils;
import com.baosight.hpjx.common.InventTypeEnum; import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoBase; import com.baosight.hpjx.core.dao.DaoBase;
...@@ -14,7 +15,6 @@ import com.baosight.iplat4j.core.ei.EiConstant; ...@@ -14,7 +15,6 @@ import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.soa.XLocalManager; import com.baosight.iplat4j.core.service.soa.XLocalManager;
import org.apache.commons.lang.StringUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -160,6 +160,30 @@ public class HPPZTools { ...@@ -160,6 +160,30 @@ public class HPPZTools {
return CommonConstant.YesNo.YES_1.equals(pz009.getValidFlag()); return CommonConstant.YesNo.YES_1.equals(pz009.getValidFlag());
} }
/**
* 拼接规格
* @param length
* @param width
* @param thick
* @return
*/
public static String jointSpec(BigDecimal length, BigDecimal width, BigDecimal thick) {
StringBuffer sb = new StringBuffer();
if (length != null && length.compareTo(BigDecimal.ZERO) != 0) {
sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(length));
sb.append("*");
}
if (width != null && width.compareTo(BigDecimal.ZERO) != 0) {
sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(width));
sb.append("*");
}
if (thick != null && thick.compareTo(BigDecimal.ZERO) != 0) {
sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(thick));
}
return sb.toString();
}
/** /**
* 判断存货名称是否存在，如果存在返回编码，否则新增并返回编码 * 判断存货名称是否存在，如果存在返回编码，否则新增并返回编码
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002.java
...@@ -54,6 +54,13 @@ public class HPSC002 extends DaoEPBase { ...@@ -54,6 +54,13 @@ public class HPSC002 extends DaoEPBase {
private String remark = " "; /* 备注*/ private String remark = " "; /* 备注*/
private Integer lv = 0; /*层级*/ private Integer lv = 0; /*层级*/
private String spec = " "; /* 规格*/
private BigDecimal length = new BigDecimal(0.00); /* 长*/
private BigDecimal width = new BigDecimal(0.00); /* 宽*/
private BigDecimal thick = new BigDecimal(0.00); /* 厚*/
/** /**
* initialize the metadata * initialize the metadata
*/ */
...@@ -190,6 +197,32 @@ public class HPSC002 extends DaoEPBase { ...@@ -190,6 +197,32 @@ public class HPSC002 extends DaoEPBase {
eiColumn = new EiColumn("lv"); eiColumn = new EiColumn("lv");
eiColumn.setDescName("层级"); eiColumn.setDescName("层级");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("spec");
eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("length");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("长");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("width");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("宽");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("thick");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("厚");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -658,6 +691,68 @@ public class HPSC002 extends DaoEPBase { ...@@ -658,6 +691,68 @@ public class HPSC002 extends DaoEPBase {
} }
/** /**
* get the sort - 规格
* @return the sort
*/
public String getSpec() {
return this.spec;
}
/**
* set the sort - 规格
*/
public void setSpec(String spec) {
this.spec = spec;
}
/**
* get the length - 长.
* @return the length
*/
public BigDecimal getLength() {
return this.length;
}
/**
* set the length - 长.
*
* @param length - 长
*/
public void setLength(BigDecimal length) {
this.length = length;
}
/**
* get the width - 宽.
* @return the width
*/
public BigDecimal getWidth() {
return this.width;
}
/**
* set the width - 宽.
*
* @param width - 宽
*/
public void setWidth(BigDecimal width) {
this.width = width;
}
/**
* get the thick - 厚.
* @return the thick
*/
public BigDecimal getThick() {
return this.thick;
}
/**
* set the thick - 厚.
*
* @param thick - 厚
*/
public void setThick(BigDecimal thick) {
this.thick = thick;
}
/**
* get the value from Map * get the value from Map
*/ */
public void fromMap(Map map) { public void fromMap(Map map) {
...@@ -693,6 +788,11 @@ public class HPSC002 extends DaoEPBase { ...@@ -693,6 +788,11 @@ public class HPSC002 extends DaoEPBase {
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("updatedTime")),updatedTime)); setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("updatedTime")),updatedTime));
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("remark")), remark)); setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("remark")), remark));
setLv(NumberUtils.toInteger(StringUtils.toString(map.get("lv")), lv)); setLv(NumberUtils.toInteger(StringUtils.toString(map.get("lv")), lv));
setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("spec")), spec));
setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get("length")), length));
setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("width")), width));
setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("thick")), thick));
} }
/** /**
...@@ -732,6 +832,10 @@ public class HPSC002 extends DaoEPBase { ...@@ -732,6 +832,10 @@ public class HPSC002 extends DaoEPBase {
map.put("updatedTime", StringUtils.toString(updatedTime, eiMetadata.getMeta("updatedTime"))); map.put("updatedTime", StringUtils.toString(updatedTime, eiMetadata.getMeta("updatedTime")));
map.put("remark", StringUtils.toString(remark, eiMetadata.getMeta("remark"))); map.put("remark", StringUtils.toString(remark, eiMetadata.getMeta("remark")));
map.put("lv", StringUtils.toString(lv, eiMetadata.getMeta("lv"))); map.put("lv", StringUtils.toString(lv, eiMetadata.getMeta("lv")));
map.put("spec", StringUtils.toString(spec, eiMetadata.getMeta("spec")));
map.put("length", StringUtils.toString(length, eiMetadata.getMeta("length")));
map.put("width", StringUtils.toString(width, eiMetadata.getMeta("width")));
map.put("thick", StringUtils.toString(thick, eiMetadata.getMeta("thick")));
return map; return map;
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC003.java
...@@ -3,6 +3,8 @@ package com.baosight.hpjx.hp.sc.domain; ...@@ -3,6 +3,8 @@ package com.baosight.hpjx.hp.sc.domain;
import com.baosight.iplat4j.core.util.NumberUtils; import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.ei.EiColumn; import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase; import com.baosight.iplat4j.core.data.DaoEPBase;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.baosight.iplat4j.core.util.StringUtils; import com.baosight.iplat4j.core.util.StringUtils;
...@@ -90,6 +92,13 @@ public class HPSC003 extends DaoEPBase { ...@@ -90,6 +92,13 @@ public class HPSC003 extends DaoEPBase {
private Long inventRecordId = new Long(0); private Long inventRecordId = new Long(0);
private String spec = " "; /* 规格*/
private BigDecimal length = new BigDecimal(0.00); /* 长*/
private BigDecimal width = new BigDecimal(0.00); /* 宽*/
private BigDecimal thick = new BigDecimal(0.00); /* 厚*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
...@@ -173,6 +182,31 @@ public class HPSC003 extends DaoEPBase { ...@@ -173,6 +182,31 @@ public class HPSC003 extends DaoEPBase {
eiColumn.setDescName("项目档案ID"); eiColumn.setDescName("项目档案ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("spec");
eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("length");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("长");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("width");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("宽");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("thick");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("厚");
eiMetadata.addMeta(eiColumn);
} }
...@@ -465,6 +499,68 @@ public class HPSC003 extends DaoEPBase { ...@@ -465,6 +499,68 @@ public class HPSC003 extends DaoEPBase {
public void setInventRecordId(Long inventRecordId) { public void setInventRecordId(Long inventRecordId) {
this.inventRecordId = inventRecordId; this.inventRecordId = inventRecordId;
} }
/**
* get the sort - 规格
* @return the sort
*/
public String getSpec() {
return this.spec;
}
/**
* set the sort - 规格
*/
public void setSpec(String spec) {
this.spec = spec;
}
/**
* get the length - 长.
* @return the length
*/
public BigDecimal getLength() {
return this.length;
}
/**
* set the length - 长.
*
* @param length - 长
*/
public void setLength(BigDecimal length) {
this.length = length;
}
/**
* get the width - 宽.
* @return the width
*/
public BigDecimal getWidth() {
return this.width;
}
/**
* set the width - 宽.
*
* @param width - 宽
*/
public void setWidth(BigDecimal width) {
this.width = width;
}
/**
* get the thick - 厚.
* @return the thick
*/
public BigDecimal getThick() {
return this.thick;
}
/**
* set the thick - 厚.
*
* @param thick - 厚
*/
public void setThick(BigDecimal thick) {
this.thick = thick;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -492,6 +588,10 @@ public class HPSC003 extends DaoEPBase { ...@@ -492,6 +588,10 @@ public class HPSC003 extends DaoEPBase {
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark)); setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SCHEDULE)), schedule)); setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_SCHEDULE)), schedule));
setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId)); setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("spec")), spec));
setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get("length")), length));
setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("width")), width));
setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("thick")), thick));
} }
...@@ -521,6 +621,10 @@ public class HPSC003 extends DaoEPBase { ...@@ -521,6 +621,10 @@ public class HPSC003 extends DaoEPBase {
map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK))); map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
map.put(FIELD_SCHEDULE, StringUtils.toString(schedule, eiMetadata.getMeta(FIELD_SCHEDULE))); map.put(FIELD_SCHEDULE, StringUtils.toString(schedule, eiMetadata.getMeta(FIELD_SCHEDULE)));
map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID))); map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
map.put("spec", StringUtils.toString(spec, eiMetadata.getMeta("spec")));
map.put("length", StringUtils.toString(length, eiMetadata.getMeta("length")));
map.put("width", StringUtils.toString(width, eiMetadata.getMeta("width")));
map.put("thick", StringUtils.toString(thick, eiMetadata.getMeta("thick")));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
...@@ -141,6 +141,12 @@ public class HPSC004 extends DaoEPBase { ...@@ -141,6 +141,12 @@ public class HPSC004 extends DaoEPBase {
private String remark = " "; /* 备注*/ private String remark = " "; /* 备注*/
private Long inventRecordId = new Long(0); private Long inventRecordId = new Long(0);
private String spec = " "; /* 规格*/
private BigDecimal length = new BigDecimal(0.00); /* 长*/
private BigDecimal width = new BigDecimal(0.00); /* 宽*/
private BigDecimal thick = new BigDecimal(0.00); /* 厚*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
...@@ -301,6 +307,31 @@ public class HPSC004 extends DaoEPBase { ...@@ -301,6 +307,31 @@ public class HPSC004 extends DaoEPBase {
eiColumn.setDescName("项目档案ID"); eiColumn.setDescName("项目档案ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("spec");
eiColumn.setDescName("规格");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("length");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("长");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("width");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("宽");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("thick");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("厚");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -888,6 +919,67 @@ public class HPSC004 extends DaoEPBase { ...@@ -888,6 +919,67 @@ public class HPSC004 extends DaoEPBase {
this.inventRecordId = inventRecordId; this.inventRecordId = inventRecordId;
} }
/** /**
* get the sort - 规格
* @return the sort
*/
public String getSpec() {
return this.spec;
}
/**
* set the sort - 规格
*/
public void setSpec(String spec) {
this.spec = spec;
}
/**
* get the length - 长.
* @return the length
*/
public BigDecimal getLength() {
return this.length;
}
/**
* set the length - 长.
*
* @param length - 长
*/
public void setLength(BigDecimal length) {
this.length = length;
}
/**
* get the width - 宽.
* @return the width
*/
public BigDecimal getWidth() {
return this.width;
}
/**
* set the width - 宽.
*
* @param width - 宽
*/
public void setWidth(BigDecimal width) {
this.width = width;
}
/**
* get the thick - 厚.
* @return the thick
*/
public BigDecimal getThick() {
return this.thick;
}
/**
* set the thick - 厚.
*
* @param thick - 厚
*/
public void setThick(BigDecimal thick) {
this.thick = thick;
}
/**
* get the value from Map. * get the value from Map.
* *
* @param map - source data map * @param map - source data map
...@@ -931,6 +1023,10 @@ public class HPSC004 extends DaoEPBase { ...@@ -931,6 +1023,10 @@ public class HPSC004 extends DaoEPBase {
setUpdatedTime(StringUtils.toString(map.get(FIELD_UPDATED_TIME))); setUpdatedTime(StringUtils.toString(map.get(FIELD_UPDATED_TIME)));
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark)); setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId)); setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
setSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("spec")), spec));
setLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get("length")), length));
setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("width")), width));
setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("thick")), thick));
} }
/** /**
...@@ -976,6 +1072,10 @@ public class HPSC004 extends DaoEPBase { ...@@ -976,6 +1072,10 @@ public class HPSC004 extends DaoEPBase {
map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME))); map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK))); map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID))); map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
map.put("spec", StringUtils.toString(spec, eiMetadata.getMeta("spec")));
map.put("length", StringUtils.toString(length, eiMetadata.getMeta("length")));
map.put("width", StringUtils.toString(width, eiMetadata.getMeta("width")));
map.put("thick", StringUtils.toString(thick, eiMetadata.getMeta("thick")));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005.java
...@@ -109,6 +109,20 @@ public class HPSC005 extends DaoEPBase { ...@@ -109,6 +109,20 @@ public class HPSC005 extends DaoEPBase {
private String filePath5 = " "; /* 文件地址5*/ private String filePath5 = " "; /* 文件地址5*/
private Long inventRecordId = new Long(0); private Long inventRecordId = new Long(0);
private String prdtSpec;
private BigDecimal prdtLength = new BigDecimal(0.00); /* 长*/
private BigDecimal prdtWidth = new BigDecimal(0.00); /* 宽*/
private BigDecimal prdtThick = new BigDecimal(0.00); /* 厚*/
private Integer partType = new Integer(0);
private String partCode;
private String partName;
private String partSpec;
private BigDecimal partLength = new BigDecimal(0.00); /* 长*/
private BigDecimal partWidth = new BigDecimal(0.00); /* 宽*/
private BigDecimal partThick = new BigDecimal(0.00); /* 厚*/
private String remark1;
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
...@@ -222,6 +236,108 @@ public class HPSC005 extends DaoEPBase { ...@@ -222,6 +236,108 @@ public class HPSC005 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID); eiColumn = new EiColumn(FIELD_INVENT_RECORD_ID);
eiColumn.setDescName("项目档案ID"); eiColumn.setDescName("项目档案ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("prdtSpec");
eiColumn.setDescName("产品规格");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("partType");
eiColumn.setDescName("零件类型");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("partCode");
eiColumn.setDescName("零件编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("partName");
eiColumn.setDescName("零件名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("partSpec");
eiColumn.setDescName("零件规格");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("remark1");
eiColumn.setDescName("备注");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("partLength");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("零件-长");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("partWidth");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("零件-宽");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("partThick");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("零件-厚");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("prdtLength");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("产品-长");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("prdtWidth");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("产品-宽");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("prdtThick");
eiColumn.setType("N");
eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10);
eiColumn.setDescName("产品-厚");
eiMetadata.addMeta(eiColumn);
}
public String getRemark1() {
return this.remark1;
}
public void setRemark1(String remark1) {
this.remark1 = remark1;
}
public String getPartSpec() {
return this.partSpec;
}
public void setPartSpec(String partSpec) {
this.partSpec = partSpec;
}
public String getPartName() {
return this.partName;
}
public void setPartName(String partName) {
this.partName = partName;
}
public String getPartCode() {
return this.partCode;
}
public void setPartCode(String partCode) {
this.partCode = partCode;
}
public Integer getPartType() {
return this.partType;
}
public void setPartType(Integer partType) {
this.partType = partType;
}
public String getPrdtSpec() {
return this.prdtSpec;
}
public void setPrdtSpec(String prdtSpec) {
this.prdtSpec = prdtSpec;
} }
/** /**
...@@ -648,6 +764,101 @@ public class HPSC005 extends DaoEPBase { ...@@ -648,6 +764,101 @@ public class HPSC005 extends DaoEPBase {
public void setInventRecordId(Long inventRecordId) { public void setInventRecordId(Long inventRecordId) {
this.inventRecordId = inventRecordId; this.inventRecordId = inventRecordId;
} }
/**
* get the length - 长.
* @return the length
*/
public BigDecimal getPrdtLength() {
return this.prdtLength;
}
/**
* set the length - 长.
*
* @param length - 长
*/
public void setPrdtLength(BigDecimal prdtLength) {
this.prdtLength = prdtLength;
}
/**
* get the width - 宽.
* @return the width
*/
public BigDecimal getPrdtWidth() {
return this.prdtWidth;
}
/**
* set the width - 宽.
*
* @param width - 宽
*/
public void setPrdtWidth(BigDecimal prdtWidth) {
this.prdtWidth = prdtWidth;
}
/**
* get the thick - 厚.
* @return the thick
*/
public BigDecimal getPrdtThick() {
return this.prdtThick;
}
/**
* set the thick - 厚.
*
* @param thick - 厚
*/
public void setPrdtThick(BigDecimal prdtThick) {
this.prdtThick = prdtThick;
}
/**
* get the length - 长.
* @return the length
*/
public BigDecimal getPartLength() {
return this.partLength;
}
/**
* set the length - 长.
*
* @param length - 长
*/
public void setPartLength(BigDecimal partLength) {
this.partLength = partLength;
}
/**
* get the width - 宽.
* @return the width
*/
public BigDecimal getPartWidth() {
return this.partWidth;
}
/**
* set the width - 宽.
*
* @param width - 宽
*/
public void setPartWidth(BigDecimal partWidth) {
this.partWidth = partWidth;
}
/**
* get the thick - 厚.
* @return the thick
*/
public BigDecimal getPartThick() {
return this.partThick;
}
/**
* set the thick - 厚.
*
* @param thick - 厚
*/
public void setPartThick(BigDecimal partThick) {
this.partThick = partThick;
}
/** /**
* get the value from Map. * get the value from Map.
...@@ -683,6 +894,19 @@ public class HPSC005 extends DaoEPBase { ...@@ -683,6 +894,19 @@ public class HPSC005 extends DaoEPBase {
setFilePath4(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH4)), filePath4)); setFilePath4(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH4)), filePath4));
setFilePath5(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH5)), filePath5)); setFilePath5(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH5)), filePath5));
setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId)); setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
setPrdtSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("prdtSpec")), prdtSpec));
setPartType(NumberUtils.toInteger(StringUtils.toString(map.get("partType")), partType));
setPartCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("partCode")), partCode));
setPartName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("partName")), partName));
setPartSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("partName")), partSpec));
setRemark1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("remark1")), remark1));
setPrdtLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get("prdtLength")), prdtLength));
setPrdtWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("prdtWidth")), prdtWidth));
setPrdtThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("prdtThick")), prdtThick));
setPartLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get("partLength")), partLength));
setPartWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("partWidth")), partWidth));
setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("partThick")), partThick));
} }
/** /**
...@@ -718,6 +942,18 @@ public class HPSC005 extends DaoEPBase { ...@@ -718,6 +942,18 @@ public class HPSC005 extends DaoEPBase {
map.put(FIELD_FILE_PATH4, StringUtils.toString(filePath4, eiMetadata.getMeta(FIELD_FILE_PATH4))); map.put(FIELD_FILE_PATH4, StringUtils.toString(filePath4, eiMetadata.getMeta(FIELD_FILE_PATH4)));
map.put(FIELD_FILE_PATH5, StringUtils.toString(filePath5, eiMetadata.getMeta(FIELD_FILE_PATH5))); map.put(FIELD_FILE_PATH5, StringUtils.toString(filePath5, eiMetadata.getMeta(FIELD_FILE_PATH5)));
map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID))); map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
map.put("prdtSpec", StringUtils.toString(prdtSpec, eiMetadata.getMeta("prdtSpec")));
map.put("partType", StringUtils.toString(partType, eiMetadata.getMeta("partType")));
map.put("partCode", StringUtils.toString(partCode, eiMetadata.getMeta("partCode")));
map.put("partName", StringUtils.toString(partName, eiMetadata.getMeta("partName")));
map.put("partSpec", StringUtils.toString(partSpec, eiMetadata.getMeta("partSpec")));
map.put("remark1", StringUtils.toString(remark1, eiMetadata.getMeta("prdtSpec")));
map.put("prdtLength", StringUtils.toString(prdtLength, eiMetadata.getMeta("prdtLength")));
map.put("prdtWidth", StringUtils.toString(prdtWidth, eiMetadata.getMeta("prdtWidth")));
map.put("prdtThick", StringUtils.toString(prdtThick, eiMetadata.getMeta("prdtThick")));
map.put("partLength", StringUtils.toString(partLength, eiMetadata.getMeta("partLength")));
map.put("partWidth", StringUtils.toString(partWidth, eiMetadata.getMeta("partWidth")));
map.put("partThick", StringUtils.toString(partThick, eiMetadata.getMeta("partThick")));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
...@@ -83,12 +83,15 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -83,12 +83,15 @@ public class ServiceHPSC002 extends ServiceBase {
BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue()))); BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue())));
hppz002.setDelStatus(CommonConstant.YesNo.NO_0.intValue()); hppz002.setDelStatus(CommonConstant.YesNo.NO_0.intValue());
hppz002.setTotalWt(totalWt); hppz002.setTotalWt(totalWt);
if (StringUtils.isNotEmpty(hppz002.getPrdtCode()) && !hppz002.getParentId().equals("root")) {
hppz002.setPrdtName(HPPZTools.getPz004ByCode(hppz002.getPrdtCode()).getInventName()); // if (StringUtils.isNotEmpty(hppz002.getPrdtCode()) && !hppz002.getParentId().equals("root")) {
} // hppz002.setPrdtName(HPPZTools.getPz004ByCode(hppz002.getPrdtCode()).getInventName());
// }
hppz002.setSpec(HPPZTools.jointSpec(hppz002.getLength(),hppz002.getWidth(),hppz002.getThick()));
if(hppz002.getParentId().equals("root")){ if(hppz002.getParentId().equals("root")){
hppz002.setLv(new Integer(1)); hppz002.setLv(new Integer(1));
}else{ }else{
hppz002.setPrdtCode(HPPZTools.checkAndSavePZ04(hppz002.getPrdtType(),hppz002.getPrdtName()));
Integer lv = (Integer) this.dao.get("HPSC002.queryLv","id",hppz002.getParentId()); Integer lv = (Integer) this.dao.get("HPSC002.queryLv","id",hppz002.getParentId());
hppz002.setLv(lv.intValue()+1); hppz002.setLv(lv.intValue()+1);
} }
...@@ -366,12 +369,13 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -366,12 +369,13 @@ public class ServiceHPSC002 extends ServiceBase {
HPSC003.setPrdtType(THPSC002.getPrdtType()); HPSC003.setPrdtType(THPSC002.getPrdtType());
HPSC003.setPrdtCode(THPSC002.getPrdtCode()); HPSC003.setPrdtCode(THPSC002.getPrdtCode());
HPSC003.setPrdtName(THPSC002.getPrdtName()); HPSC003.setPrdtName(THPSC002.getPrdtName());
HPSC003.setSpec(THPSC002.getSpec());
HPSC003.setLength(THPSC002.getLength());
HPSC003.setWidth(THPSC002.getWidth());
HPSC003.setThick(THPSC002.getThick());
HPSC003.setRemark(THPSC002.getRemark());
HPSC003.setPlanCompletionDate(""); HPSC003.setPlanCompletionDate("");
HPSC003.setStatus(0); HPSC003.setStatus(0);
HPSC003.setCreatedBy(UserSession.getUserId());
HPSC003.setCreatedTime(sdf.format(new Date()));
HPSC003.setUpdatedBy(null);
HPSC003.setUpdatedTime(null);
DaoUtils.insert("HPSC003.insert", HPSC003.toMap()); DaoUtils.insert("HPSC003.insert", HPSC003.toMap());
//生产计划详情 //生产计划详情
...@@ -392,6 +396,11 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -392,6 +396,11 @@ public class ServiceHPSC002 extends ServiceBase {
HPSC004.setPrdtType(HPSC002.getPrdtType()); HPSC004.setPrdtType(HPSC002.getPrdtType());
HPSC004.setPrdtCode(HPSC002.getPrdtCode()); HPSC004.setPrdtCode(HPSC002.getPrdtCode());
HPSC004.setPrdtName(HPSC002.getPrdtName()); HPSC004.setPrdtName(HPSC002.getPrdtName());
HPSC004.setSpec(HPSC002.getSpec());
HPSC004.setLength(HPSC002.getLength());
HPSC004.setWidth(HPSC002.getWidth());
HPSC004.setThick(HPSC002.getThick());
HPSC004.setRemark(HPSC002.getRemark());
HPSC004.setNum(HPSC002.getNum()); HPSC004.setNum(HPSC002.getNum());
HPSC004.setUnitWt(HPSC002.getUnitWt()); HPSC004.setUnitWt(HPSC002.getUnitWt());
HPSC004.setFilePath1(HPSC002.getId().toString()); HPSC004.setFilePath1(HPSC002.getId().toString());
...@@ -401,10 +410,6 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -401,10 +410,6 @@ public class ServiceHPSC002 extends ServiceBase {
HPSC004.setActualCompletionUnitWt(NumberUtils.toBigDecimal(0.00)); HPSC004.setActualCompletionUnitWt(NumberUtils.toBigDecimal(0.00));
HPSC004.setActualCompletionDate(""); HPSC004.setActualCompletionDate("");
HPSC004.setDelStatus(1); HPSC004.setDelStatus(1);
HPSC004.setCreatedBy(UserSession.getUserId());
HPSC004.setCreatedTime(sdf.format(new Date()));
HPSC004.setUpdatedBy(null);
HPSC004.setUpdatedTime(null);
DaoUtils.insert("HPSC004.insert", HPSC004.toMap()); DaoUtils.insert("HPSC004.insert", HPSC004.toMap());
} }
} }
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java
...@@ -209,9 +209,22 @@ public class ServiceHPSC003 extends ServiceBase { ...@@ -209,9 +209,22 @@ public class ServiceHPSC003 extends ServiceBase {
HPSC005.setProjName(HPSC003.getProjName()); HPSC005.setProjName(HPSC003.getProjName());
HPSC005.setProductionOrderNo(SCDD); HPSC005.setProductionOrderNo(SCDD);
HPSC005.setInventRecordId(HPSC004.getInventRecordId()); HPSC005.setInventRecordId(HPSC004.getInventRecordId());
HPSC005.setPrdtType(HPSC004.getPrdtType()); HPSC005.setPrdtType(HPSC003.getPrdtType());
HPSC005.setPrdtCode(HPSC004.getPrdtCode()); HPSC005.setPrdtCode(HPSC003.getPrdtCode());
HPSC005.setPrdtName(HPSC004.getPrdtName()); HPSC005.setPrdtName(HPSC003.getPrdtName());
HPSC005.setPrdtLength(HPSC003.getLength());
HPSC005.setPrdtWidth(HPSC003.getWidth());
HPSC005.setPrdtThick(HPSC003.getThick());
HPSC005.setPrdtSpec(HPSC003.getSpec());
HPSC005.setRemark(HPSC003.getRemark());
HPSC005.setPartType(HPSC004.getPrdtType());
HPSC005.setPartCode(HPSC004.getPrdtCode());
HPSC005.setPartName(HPSC004.getPrdtName());
HPSC005.setPartLength(HPSC004.getLength());
HPSC005.setPartWidth(HPSC004.getWidth());
HPSC005.setPartThick(HPSC004.getThick());
HPSC005.setPartSpec(HPSC004.getSpec());
HPSC005.setRemark1(HPSC004.getRemark());
HPSC005.setPlanCompletionDate(HPSC004.getPlanCompletionDate()); HPSC005.setPlanCompletionDate(HPSC004.getPlanCompletionDate());
HPSC005.setNum(HPSC004.getNum()); HPSC005.setNum(HPSC004.getNum());
HPSC005.setTotalWt(HPSC004.getUnitWt()); HPSC005.setTotalWt(HPSC004.getUnitWt());
...@@ -234,16 +247,4 @@ public class ServiceHPSC003 extends ServiceBase { ...@@ -234,16 +247,4 @@ public class ServiceHPSC003 extends ServiceBase {
return eiInfo; return eiInfo;
} }
private static String generateFixedLengthRandomNumber(int length) {
StringBuilder sb = new StringBuilder();
Random rand = new Random();
for (int i = 0; i < length; i++) {
int digit = rand.nextInt(10); // 生成0-9之间的随机数字
sb.append(digit);
}
return sb.toString();
}
} }
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
...@@ -68,7 +68,12 @@ ...@@ -68,7 +68,12 @@
UPDATED_BY as "updatedBy", <!-- 更新人 --> UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 --> UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
REMARK as "remark", <!-- 备注 --> REMARK as "remark", <!-- 备注 -->
LV as "lv" LV as "lv",
SPEC as "spec",
LENGTH as "length", <!-- 长 -->
WIDTH as "width", <!-- 宽 -->
THICK as "thick" <!-- 厚 -->
FROM hpjx.t_hpsc002 WHERE 1=1 FROM hpjx.t_hpsc002 WHERE 1=1
AND PARENT_ID NOT IN ('root') AND PARENT_ID NOT IN ('root')
AND DEL_STATUS = 0 AND DEL_STATUS = 0
...@@ -259,9 +264,17 @@ ...@@ -259,9 +264,17 @@
UPDATED_BY, <!-- 更新人 --> UPDATED_BY, <!-- 更新人 -->
UPDATED_TIME, <!-- 更新时间 --> UPDATED_TIME, <!-- 更新时间 -->
REMARK, <!-- 备注 --> REMARK, <!-- 备注 -->
LV LV,
SPEC,
LENGTH, <!-- 长 -->
WIDTH, <!-- 宽 -->
THICK <!-- 厚 -->
) )
VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#, #type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#, #prdtName#, #inventRecordId#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#, #lv#) VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#,
#type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#, #prdtName#, #inventRecordId#, #num#,
#unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #status#,
#delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#, #lv#, #spec#,
#length#, #width#, #thick#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -300,7 +313,11 @@ ...@@ -300,7 +313,11 @@
CREATED_TIME = #createdTime#, <!-- 创建时间 --> CREATED_TIME = #createdTime#, <!-- 创建时间 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 --> UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 --> UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
REMARK = #remark# <!-- 备注 --> REMARK = #remark#, <!-- 备注 -->
SPEC = #spec#, <!-- 规格 -->
LENGTH = #length#, <!-- 长 -->
WIDTH = #width#, <!-- 宽 -->
THICK = #thick# <!-- 厚 -->
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
...@@ -322,7 +339,8 @@ ...@@ -322,7 +339,8 @@
LEAF as "leaf", <!-- 是否有叶子节点 --> LEAF as "leaf", <!-- 是否有叶子节点 -->
SORT as "sort", <!-- 排序字段 --> SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 --> ICON as "icon", <!-- 图片地址 -->
LV as "lv" LV as "lv",
SPEC as "spec"
FROM FROM
hpjx.t_hpsc002 hpjx.t_hpsc002
WHERE WHERE
...@@ -368,7 +386,11 @@ ...@@ -368,7 +386,11 @@
UPDATED_BY as "updatedBy", <!-- 更新人 --> UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 --> UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
REMARK as "remark", <!-- 备注 --> REMARK as "remark", <!-- 备注 -->
LV as "lv" LV as "lv",
SPEC as "spec",
LENGTH as "length", <!-- 长 -->
WIDTH as "width", <!-- 宽 -->
THICK as "thick" <!-- 厚 -->
FROM hpjx.t_hpsc002 FROM hpjx.t_hpsc002
WHERE 1 = 1 WHERE 1 = 1
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
...@@ -413,7 +435,11 @@ ...@@ -413,7 +435,11 @@
UPDATED_BY as "updatedBy", <!-- 更新人 --> UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 --> UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
REMARK as "remark", <!-- 备注 --> REMARK as "remark", <!-- 备注 -->
LV as "lv" LV as "lv",
SPEC as "spec",
LENGTH as "length", <!-- 长 -->
WIDTH as "width", <!-- 宽 -->
THICK as "thick" <!-- 厚 -->
FROM hpjx.t_hpsc002 WHERE 1 = 1 FROM hpjx.t_hpsc002 WHERE 1 = 1
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
PLAN_INFO_NO as "planInfoNo", <!-- 生产计划单号 --> PLAN_INFO_NO as "planInfoNo", <!-- 生产计划单号 -->
INVENT_RECORD_ID as "inventRecordId", INVENT_RECORD_ID as "inventRecordId",
PRDT_TYPE as "prdtType", PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode", <!-- 部件编码 --> PRDT_CODE as "prdtCode", <!-- 产品编码 -->
PRDT_NAME as "prdtName", <!-- 部件名称 --> PRDT_NAME as "prdtName", <!-- 产品名称 -->
PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 --> PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 -->
STATUS as "status", <!-- 状态 0-计划中，1-生产中 --> STATUS as "status", <!-- 状态 0-计划中，1-生产中 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
...@@ -98,6 +98,10 @@ ...@@ -98,6 +98,10 @@
UPDATED_TIME as "updatedTime", <!-- 更新时间 --> UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
DEP_CODE as "depCode", <!-- 部门编码 --> DEP_CODE as "depCode", <!-- 部门编码 -->
REMARK as "remark", <!-- 备注 --> REMARK as "remark", <!-- 备注 -->
SPEC as "spec",
LENGTH as "length", <!-- 长 -->
WIDTH as "width", <!-- 宽 -->
THICK as "thick", <!-- 厚 -->
CONCAT(( CONCAT((
SELECT SELECT
format((ifnull( SUM( ACTUAL_COMPLETION_NUM ), 0 ) / ifnull( SUM( NUM ), 0 ) * 100),2) format((ifnull( SUM( ACTUAL_COMPLETION_NUM ), 0 ) / ifnull( SUM( NUM ), 0 ) * 100),2)
...@@ -180,9 +184,13 @@ ...@@ -180,9 +184,13 @@
PROJ_NAME, <!-- 项目名称 --> PROJ_NAME, <!-- 项目名称 -->
PLAN_INFO_NO, <!-- 生产计划单号 --> PLAN_INFO_NO, <!-- 生产计划单号 -->
INVENT_RECORD_ID, INVENT_RECORD_ID,
SPEC,
LENGTH, <!-- 长 -->
WIDTH, <!-- 宽 -->
THICK, <!-- 厚 -->
PRDT_TYPE, PRDT_TYPE,
PRDT_CODE, <!-- 部件编码 --> PRDT_CODE, <!-- 产品编码 -->
PRDT_NAME, <!-- 部件名称 --> PRDT_NAME, <!-- 产品名称 -->
PLAN_COMPLETION_DATE, <!-- 计划完成日期 --> PLAN_COMPLETION_DATE, <!-- 计划完成日期 -->
STATUS, <!-- 状态 0-计划中，1-生产中 --> STATUS, <!-- 状态 0-计划中，1-生产中 -->
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
...@@ -192,7 +200,9 @@ ...@@ -192,7 +200,9 @@
DEP_CODE, <!-- 部门编码 --> DEP_CODE, <!-- 部门编码 -->
REMARK <!-- 备注 --> REMARK <!-- 备注 -->
) )
VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#,#inventRecordId#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #status#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#) VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#,#inventRecordId#,
#spec#, #length#, #width#, #thick#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #status#, #createdBy#,
#createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -209,8 +219,12 @@ ...@@ -209,8 +219,12 @@
PROJ_NAME = #projName#, <!-- 项目编码 --> PROJ_NAME = #projName#, <!-- 项目编码 -->
PLAN_INFO_NO = #planInfoNo#, <!-- 生产计划单号 --> PLAN_INFO_NO = #planInfoNo#, <!-- 生产计划单号 -->
PRDT_TYPE = #prdtType#, PRDT_TYPE = #prdtType#,
PRDT_CODE = #prdtCode#, <!-- 部件编码 --> SPEC = #spec#, <!-- 规格 -->
PRDT_NAME = #prdtName#, <!-- 部件名称 --> LENGTH = #length#, <!-- 长 -->
WIDTH = #width#, <!-- 宽 -->
THICK = #thick#, <!-- 厚 -->
PRDT_CODE = #prdtCode#, <!-- 产品编码 -->
PRDT_NAME = #prdtName#, <!-- 产品名称 -->
PLAN_COMPLETION_DATE = #planCompletionDate#, <!-- 计划完成日期 --> PLAN_COMPLETION_DATE = #planCompletionDate#, <!-- 计划完成日期 -->
STATUS = #status#, <!-- 状态 0-计划中，1-生产中 --> STATUS = #status#, <!-- 状态 0-计划中，1-生产中 -->
CREATED_BY = #createdBy#, <!-- 创建人 --> CREATED_BY = #createdBy#, <!-- 创建人 -->
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
...@@ -156,16 +156,20 @@ ...@@ -156,16 +156,20 @@
DEPT_CODE as "deptCode", <!-- 部门编码 预留 --> DEPT_CODE as "deptCode", <!-- 部门编码 预留 -->
PROJ_CODE as "projCode", <!-- 项目编码 --> PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PARENT_ID as "parentId", <!-- 父节点-部件编码 --> PARENT_ID as "parentId", <!-- 父节点-产品编码 -->
PARENT_PRDT_NAME as "parentPrdtName", <!-- 父节点-部件名称 --> PARENT_PRDT_NAME as "parentPrdtName", <!-- 父节点-产品名称 -->
TYPE as "type", <!-- 类别 --> TYPE as "type", <!-- 类别 -->
LEAF as "leaf", <!-- 是否有叶子节点 --> LEAF as "leaf", <!-- 是否有叶子节点 -->
SORT as "sort", <!-- 排序字段 --> SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 --> ICON as "icon", <!-- 图片地址 -->
INVENT_RECORD_ID as "inventRecordId", INVENT_RECORD_ID as "inventRecordId",
SPEC as "spec",
LENGTH as "length", <!-- 长 -->
WIDTH as "width", <!-- 宽 -->
THICK as "thick", <!-- 厚 -->
PRDT_TYPE as "prdtType", PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode", <!-- 部件编码 --> PRDT_CODE as "prdtCode", <!-- 产品编码 -->
PRDT_NAME as "prdtName", <!-- 部件名称 --> PRDT_NAME as "prdtName", <!-- 产品名称 -->
NUM as "num", <!-- 数量 --> NUM as "num", <!-- 数量 -->
UNIT_WT as "unitWt", <!-- 单重 --> UNIT_WT as "unitWt", <!-- 单重 -->
TOTAL_WT as "totalWt", <!-- 总重 --> TOTAL_WT as "totalWt", <!-- 总重 -->
...@@ -179,7 +183,7 @@ ...@@ -179,7 +183,7 @@
ACTUAL_COMPLETION_DATE as "actualCompletionDate", <!-- 实际完工日期 --> ACTUAL_COMPLETION_DATE as "actualCompletionDate", <!-- 实际完工日期 -->
ACTUAL_COMPLETION_NUM as "actualCompletionNum", <!-- 实际完工数量 --> ACTUAL_COMPLETION_NUM as "actualCompletionNum", <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT as "actualCompletionUnitWt", <!-- 实际完工重量 --> ACTUAL_COMPLETION_UNIT_WT as "actualCompletionUnitWt", <!-- 实际完工重量 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 --> STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 --> DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
...@@ -312,16 +316,20 @@ ...@@ -312,16 +316,20 @@
DEPT_CODE, <!-- 部门编码 预留 --> DEPT_CODE, <!-- 部门编码 预留 -->
PROJ_CODE, <!-- 项目编码 --> PROJ_CODE, <!-- 项目编码 -->
PROJ_NAME, <!-- 项目名称 --> PROJ_NAME, <!-- 项目名称 -->
PARENT_ID, <!-- 父节点-部件编码 --> PARENT_ID, <!-- 父节点-产品编码 -->
PARENT_PRDT_NAME, <!-- 父节点-部件名称 --> PARENT_PRDT_NAME, <!-- 父节点-产品名称 -->
TYPE, <!-- 类别 --> TYPE, <!-- 类别 -->
LEAF, <!-- 是否有叶子节点 --> LEAF, <!-- 是否有叶子节点 -->
SORT, <!-- 排序字段 --> SORT, <!-- 排序字段 -->
ICON, <!-- 图片地址 --> ICON, <!-- 图片地址 -->
INVENT_RECORD_ID, INVENT_RECORD_ID,
SPEC,
LENGTH, <!-- 长 -->
WIDTH, <!-- 宽 -->
THICK, <!-- 厚 -->
PRDT_TYPE, PRDT_TYPE,
PRDT_CODE, <!-- 部件编码 --> PRDT_CODE, <!-- 产品编码 -->
PRDT_NAME, <!-- 部件名称 --> PRDT_NAME, <!-- 产品名称 -->
NUM, <!-- 数量 --> NUM, <!-- 数量 -->
UNIT_WT, <!-- 单重 --> UNIT_WT, <!-- 单重 -->
TOTAL_WT, <!-- 总重 --> TOTAL_WT, <!-- 总重 -->
...@@ -335,7 +343,7 @@ ...@@ -335,7 +343,7 @@
ACTUAL_COMPLETION_DATE, <!-- 实际完工日期 --> ACTUAL_COMPLETION_DATE, <!-- 实际完工日期 -->
ACTUAL_COMPLETION_NUM, <!-- 实际完工数量 --> ACTUAL_COMPLETION_NUM, <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT, <!-- 实际完工重量 --> ACTUAL_COMPLETION_UNIT_WT, <!-- 实际完工重量 -->
STATUS, <!-- 状态 0-未提交，1-已提交 --> STATUS, <!-- 状态 0-未审核，1-已审核 -->
DEL_STATUS, <!-- 状态 1未删除，0已删除 --> DEL_STATUS, <!-- 状态 1未删除，0已删除 -->
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
CREATED_TIME, <!-- 创建时间 --> CREATED_TIME, <!-- 创建时间 -->
...@@ -343,11 +351,12 @@ ...@@ -343,11 +351,12 @@
UPDATED_TIME, <!-- 更新时间 --> UPDATED_TIME, <!-- 更新时间 -->
REMARK <!-- 备注 --> REMARK <!-- 备注 -->
) )
VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentId#, VALUES (#id#, #companyCode#, #deptCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#,
#parentPrdtName#, #type#, #leaf#, #sort#, #icon#,#inventRecordId#, #type#, #leaf#, #sort#, #icon#,#inventRecordId#,#spec#, #length#, #width#, #thick#,#prdtType#, #prdtCode#, #prdtName#,
#prdtType#, #prdtCode#, #prdtName#, #num#, #unitWt#, #totalWt#, #num#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#,
#filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #planCommentDate#, #planCompletionDate#, #actualCompletionDate#, #actualCompletionNum#,
#planCommentDate#, #planCompletionDate#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#) #actualCompletionUnitWt#, #status#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#,
#updatedTime#, #remark#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -362,15 +371,15 @@ ...@@ -362,15 +371,15 @@
DEPT_CODE = #deptCode#, <!-- 部门编码 预留 --> DEPT_CODE = #deptCode#, <!-- 部门编码 预留 -->
PROJ_CODE = #projCode#, <!-- 项目编码 --> PROJ_CODE = #projCode#, <!-- 项目编码 -->
PROJ_NAME = #projName#, <!-- 项目名称 --> PROJ_NAME = #projName#, <!-- 项目名称 -->
PARENT_ID = #parentId#, <!-- 父节点-部件编码 --> PARENT_ID = #parentId#, <!-- 父节点-产品编码 -->
PARENT_PRDT_NAME = #parentPrdtName#, <!-- 父节点-部件名称 --> PARENT_PRDT_NAME = #parentPrdtName#, <!-- 父节点-产品名称 -->
TYPE = #type#, <!-- 类别 --> TYPE = #type#, <!-- 类别 -->
LEAF = #leaf#, <!-- 是否有叶子节点 --> LEAF = #leaf#, <!-- 是否有叶子节点 -->
SORT = #sort#, <!-- 排序字段 --> SORT = #sort#, <!-- 排序字段 -->
ICON = #icon#, <!-- 图片地址 --> ICON = #icon#, <!-- 图片地址 -->
PRDT_TYPE = #prdtType#, PRDT_TYPE = #prdtType#,
PRDT_CODE = #prdtCode#, <!-- 部件编码 --> PRDT_CODE = #prdtCode#, <!-- 产品编码 -->
PRDT_NAME = #prdtName#, <!-- 部件名称 --> PRDT_NAME = #prdtName#, <!-- 产品名称 -->
NUM = #num#, <!-- 数量 --> NUM = #num#, <!-- 数量 -->
UNIT_WT = #unitWt#, <!-- 单重 --> UNIT_WT = #unitWt#, <!-- 单重 -->
TOTAL_WT = #totalWt#, <!-- 总重 --> TOTAL_WT = #totalWt#, <!-- 总重 -->
...@@ -385,13 +394,17 @@ ...@@ -385,13 +394,17 @@
ACTUAL_COMPLETION_NUM = #actualCompletionNum#, <!-- 实际完工数量 --> ACTUAL_COMPLETION_NUM = #actualCompletionNum#, <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#, <!-- 实际完工重量 --> ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#, <!-- 实际完工重量 -->
PRODUCTION_ORDER_NO = #productionOrderNo#, <!-- 生产订单号 --> PRODUCTION_ORDER_NO = #productionOrderNo#, <!-- 生产订单号 -->
STATUS = #status#, <!-- 状态 0-未提交，1-已提交 --> STATUS = #status#, <!-- 状态 0-未审核，1-已审核 -->
DEL_STATUS = #delStatus#, <!-- 状态 1未删除，0已删除 --> DEL_STATUS = #delStatus#, <!-- 状态 1未删除，0已删除 -->
CREATED_BY = #createdBy#, <!-- 创建人 --> CREATED_BY = #createdBy#, <!-- 创建人 -->
CREATED_TIME = #createdTime#, <!-- 创建时间 --> CREATED_TIME = #createdTime#, <!-- 创建时间 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 --> UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 --> UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
REMARK = #remark# <!-- 备注 --> REMARK = #remark#, <!-- 备注 -->
SPEC = #spec#, <!-- 规格 -->
LENGTH = #length#, <!-- 长 -->
WIDTH = #width#, <!-- 宽 -->
THICK = #thick# <!-- 厚 -->
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
...@@ -415,16 +428,20 @@ ...@@ -415,16 +428,20 @@
DEPT_CODE as "deptCode", <!-- 部门编码 预留 --> DEPT_CODE as "deptCode", <!-- 部门编码 预留 -->
PROJ_CODE as "projCode", <!-- 项目编码 --> PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PARENT_ID as "parentId", <!-- 父节点-部件编码 --> PARENT_ID as "parentId", <!-- 父节点-产品编码 -->
PARENT_PRDT_NAME as "parentPrdtName", <!-- 父节点-部件名称 --> PARENT_PRDT_NAME as "parentPrdtName", <!-- 父节点-产品名称 -->
TYPE as "type", <!-- 类别 --> TYPE as "type", <!-- 类别 -->
LEAF as "leaf", <!-- 是否有叶子节点 --> LEAF as "leaf", <!-- 是否有叶子节点 -->
SORT as "sort", <!-- 排序字段 --> SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 --> ICON as "icon", <!-- 图片地址 -->
INVENT_RECORD_ID as "inventRecordId", INVENT_RECORD_ID as "inventRecordId",
PRDT_TYPE as "prdtType", PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode", <!-- 部件编码 --> PRDT_CODE as "prdtCode", <!-- 产品编码 -->
PRDT_NAME as "prdtName", <!-- 部件名称 --> PRDT_NAME as "prdtName", <!-- 产品名称 -->
SPEC as "spec",
LENGTH as "length", <!-- 长 -->
WIDTH as "width", <!-- 宽 -->
THICK as "thick", <!-- 厚 -->
NUM as "num", <!-- 数量 --> NUM as "num", <!-- 数量 -->
UNIT_WT as "unitWt", <!-- 单重 --> UNIT_WT as "unitWt", <!-- 单重 -->
TOTAL_WT as "totalWt", <!-- 总重 --> TOTAL_WT as "totalWt", <!-- 总重 -->
...@@ -438,7 +455,7 @@ ...@@ -438,7 +455,7 @@
ACTUAL_COMPLETION_DATE as "actualCompletionDate", <!-- 实际完工日期 --> ACTUAL_COMPLETION_DATE as "actualCompletionDate", <!-- 实际完工日期 -->
ACTUAL_COMPLETION_NUM as "actualCompletionNum", <!-- 实际完工数量 --> ACTUAL_COMPLETION_NUM as "actualCompletionNum", <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT as "actualCompletionUnitWt", <!-- 实际完工重量 --> ACTUAL_COMPLETION_UNIT_WT as "actualCompletionUnitWt", <!-- 实际完工重量 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 --> STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 --> DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005.xml
...@@ -137,7 +137,19 @@ ...@@ -137,7 +137,19 @@
FILE_PATH2 as "filePath2", <!-- 文件地址2 --> FILE_PATH2 as "filePath2", <!-- 文件地址2 -->
FILE_PATH3 as "filePath3", <!-- 文件地址3 --> FILE_PATH3 as "filePath3", <!-- 文件地址3 -->
FILE_PATH4 as "filePath4", <!-- 文件地址4 --> FILE_PATH4 as "filePath4", <!-- 文件地址4 -->
FILE_PATH5 as "filePath5" <!-- 文件地址5 --> FILE_PATH5 as "filePath5", <!-- 文件地址5 -->
PRDT_SPEC as "prdtSpec",
PART_TYPE as "partType",
PART_CODE as "partCode",
PART_NAME as "partName",
PART_SPEC as "partSpec",
REMARK1 as "remark1",
PRDT_LENGTH as "prdtLength", <!-- 长 -->
PRDT_WIDTH as "prdtWidth", <!-- 宽 -->
PRDT_THICK as "prdtThick", <!-- 厚 -->
PART_LENGTH as "partLength", <!-- 长 -->
PART_WIDTH as "partWidth", <!-- 宽 -->
PART_THICK as "partThick" <!-- 厚 -->
FROM ${hpjxSchema}.T_HPSC005 WHERE 1=1 FROM ${hpjxSchema}.T_HPSC005 WHERE 1=1
<include refid="condition" /> <include refid="condition" />
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
...@@ -242,9 +254,25 @@ ...@@ -242,9 +254,25 @@
FILE_PATH2, <!-- 文件地址2 --> FILE_PATH2, <!-- 文件地址2 -->
FILE_PATH3, <!-- 文件地址3 --> FILE_PATH3, <!-- 文件地址3 -->
FILE_PATH4, <!-- 文件地址4 --> FILE_PATH4, <!-- 文件地址4 -->
FILE_PATH5 <!-- 文件地址5 --> FILE_PATH5, <!-- 文件地址5 -->
PRDT_SPEC,
PART_TYPE,
PART_CODE,
PART_NAME,
PART_SPEC,
REMARK1,
PRDT_LENGTH, <!-- 长 -->
PRDT_WIDTH, <!-- 宽 -->
PRDT_THICK, <!-- 厚 -->
PART_LENGTH, <!-- 长 -->
PART_WIDTH, <!-- 宽 -->
PART_THICK <!-- 厚 -->
) )
VALUES (#id#, #companyCode#, #projCode#, #projName#, #productionOrderNo#,#inventRecordId#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #num#, #totalWt#, #status#, #orgNo#, #orgName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#) VALUES (#id#, #companyCode#, #projCode#, #projName#, #productionOrderNo#,#inventRecordId#, #prdtType#, #prdtCode#,
#prdtName#, #planCompletionDate#, #num#, #totalWt#, #status#, #orgNo#, #orgName#, #createdBy#, #createdTime#,
#updatedBy#, #updatedTime#, #depCode#, #remark#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#,
#prdtSpec#,#partType#,#partCode#,#partName#,#partSpec#,#remark1#,
#prdtLength#,#prdtWidth#,#prdtThick#,#partLength#,#partWidth#,#partThick#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
......
src/main/webapp/HP/KC/HPKC003.js
...@@ -103,10 +103,24 @@ let productionOrderQueryCallback = function (row) { ...@@ -103,10 +103,24 @@ let productionOrderQueryCallback = function (row) {
resultGrid.setCellValue(0, "productionOrderNo", row[i]["productionOrderNo"]); resultGrid.setCellValue(0, "productionOrderNo", row[i]["productionOrderNo"]);
resultGrid.setCellValue(0, "amount", row[i]["num"]); resultGrid.setCellValue(0, "amount", row[i]["num"]);
resultGrid.setCellValue(0, "weight", row[i]["totalWt"]); resultGrid.setCellValue(0, "weight", row[i]["totalWt"]);
resultGrid.setCellValue(0, "inventType", row[i]["prdtType"]); resultGrid.setCellValue(0, "projCode", row[i]["projCode"]);
resultGrid.setCellValue(0, "inventCode", row[i]["prdtCode"]); resultGrid.setCellValue(0, "projName", row[i]["projName"]);
resultGrid.setCellValue(0, "inventName", row[i]["prdtName"]); resultGrid.setCellValue(0, "prdtType", row[i]["prdtType"]);
resultGrid.setCellValue(0, "inventRecordId", row[i]["inventRecordId"]); resultGrid.setCellValue(0, "prdtCode", row[i]["prdtCode"]);
resultGrid.setCellValue(0, "prdtName", row[i]["prdtName"]);
resultGrid.setCellValue(0, "prdtSpec", row[i]["prdtSpec"]);
resultGrid.setCellValue(0, "prdtLength", row[i]["prdtLength"]);
resultGrid.setCellValue(0, "prdtWidth", row[i]["prdtWidth"]);
resultGrid.setCellValue(0, "prdtThick", row[i]["prdtThick"]);
resultGrid.setCellValue(0, "partType", row[i]["partType"]);
resultGrid.setCellValue(0, "partCode", row[i]["partCode"]);
resultGrid.setCellValue(0, "partName", row[i]["partName"]);
resultGrid.setCellValue(0, "partSpec", row[i]["partSpec"]);
resultGrid.setCellValue(0, "partLength", row[i]["partLength"]);
resultGrid.setCellValue(0, "partWidth", row[i]["partWidth"]);
resultGrid.setCellValue(0, "partThick", row[i]["partThick"]);
resultGrid.setCellValue(0, "remark", row[i]["remark"]);
resultGrid.setCellValue(0, "remark1", row[i]["remark1"]);
lists[i] = i; lists[i] = i;
} }
resultGrid.setCheckedRows(lists); resultGrid.setCheckedRows(lists);
......
src/main/webapp/HP/KC/HPKC003.jsp
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
<EF:EFRegion id="result" title="明细信息"> <EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row"> <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn enable="false" ename="projCode" cname="项目号" align="center"/>
<EF:EFColumn enable="false" ename="projName" cname="项目名称" align="center"/>
<EF:EFColumn ename="prodNo" cname="生产入库单号" enable="false" width="130" align="center"/> <EF:EFColumn ename="prodNo" cname="生产入库单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="productionOrderNo" cname="生产订单号" enable="false" width="130" align="center"/> <EF:EFColumn ename="productionOrderNo" cname="生产订单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="documentDate" cname="单据日期" width="100" align="center" editType="date" readonly="true" <EF:EFColumn ename="documentDate" cname="单据日期" width="100" align="center" editType="date" readonly="true"
...@@ -51,13 +53,26 @@ ...@@ -51,13 +53,26 @@
sumType="all" readonly="true"/> sumType="all" readonly="true"/>
<EF:EFColumn cname="重量" ename="weight" width="100" align="right" format="{0:N3}" <EF:EFColumn cname="重量" ename="weight" width="100" align="right" format="{0:N3}"
sumType="all" readonly="true"/> sumType="all" readonly="true"/>
<EF:EFComboColumn cname="存货类型" ename="inventType" width="90" align="center" enable="false"> <EF:EFComboColumn ename="prdtType" cname="部件类型" width="90" align="center" enable="false">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn cname="存货代码" ename="inventCode" width="120" align="center" enable="false"/> <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" align="center"/>
<EF:EFColumn cname="存货名称" ename="inventName" width="120" align="center" enable="false"/> <EF:EFColumn enable="false" ename="prdtName" cname="部件名称" align="center"/>
<EF:EFColumn ename="inventRecordId" cname="存货档案ID" width="120" align="center" hidden="true"/> <EF:EFColumn enable="false" ename="prdtSpec" cname="部件规格" align="center"/>
<EF:EFColumn ename="remark" cname="备注" width="150" editType="textarea" readonly="true"/> <EF:EFColumn hidden="true" enable="false" ename="prdtLength" cname="部件-长"/>
<EF:EFColumn hidden="true" enable="false" ename="prdtWidth" cname="部件-宽"/>
<EF:EFColumn hidden="true" enable="false" ename="prdtThick" cname="部件-厚"/>
<EF:EFColumn enable="false" ename="remark" cname="部件备注"/>
<EF:EFComboColumn ename="partType" cname="零件类型" width="90" align="center" enable="false">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="partCode" cname="零件编码" align="center"/>
<EF:EFColumn enable="false" ename="partName" cname="零件名称" align="center"/>
<EF:EFColumn enable="false" ename="partSpec" cname="零件规格" align="center"/>
<EF:EFColumn hidden="true" enable="false" ename="partLength" cname="零件-长"/>
<EF:EFColumn hidden="true" enable="false" ename="partWidth" cname="零件-宽"/>
<EF:EFColumn hidden="true" enable="false" ename="partThick" cname="零件-厚"/>
<EF:EFColumn enable="false" ename="remark1" cname="零件备注"/>
<EF:EFColumn cname="原生产单号" ename="prodNoOld" enable="false" width="140" align="center" hidden="true"/> <EF:EFColumn cname="原生产单号" ename="prodNoOld" enable="false" width="140" align="center" hidden="true"/>
<EF:EFColumn cname="创建人名称" ename="createdName" enable="false" width="120" align="center"/> <EF:EFColumn cname="创建人名称" ename="createdName" enable="false" width="120" align="center"/>
<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center" <EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
......
src/main/webapp/HP/KC/HPKC099.jsp
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
<EF:EFGrid blockId="result" autoDraw="no"> <EF:EFGrid blockId="result" autoDraw="no">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="inventRecordId" cname="项目档案ID" hidden="true"/>
<EF:EFColumn enable="false" ename="projCode" cname="项目号" /> <EF:EFColumn enable="false" ename="projCode" cname="项目号" />
<EF:EFColumn enable="false" ename="projName" cname="项目名称"/> <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
<EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/> <EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/>
...@@ -39,6 +38,22 @@ ...@@ -39,6 +38,22 @@
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/> <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/>
<EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/> <EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/>
<EF:EFColumn enable="false" ename="prdtSpec" cname="部件规格"/>
<EF:EFColumn hidden="true" enable="false" ename="prdtLength" cname="部件-长"/>
<EF:EFColumn hidden="true" enable="false" ename="prdtWidth" cname="部件-宽"/>
<EF:EFColumn hidden="true" enable="false" ename="prdtThick" cname="部件-厚"/>
<EF:EFColumn enable="false" ename="remark" cname="部件备注"/>
<EF:EFComboColumn ename="partType" cname="零件类型" width="90" align="center" enable="false">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="partCode" cname="零件编码"/>
<EF:EFColumn enable="false" ename="partName" cname="零件名称"/>
<EF:EFColumn enable="false" ename="partSpec" cname="零件规格"/>
<EF:EFColumn hidden="true" enable="false" ename="partLength" cname="零件-长"/>
<EF:EFColumn hidden="true" enable="false" ename="partWidth" cname="零件-宽"/>
<EF:EFColumn hidden="true" enable="false" ename="partThick" cname="零件-厚"/>
<EF:EFColumn enable="false" ename="remark1" cname="零件备注"/>
<EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/> <EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/>
<EF:EFColumn enable="false" ename="num" cname="计划数量"/> <EF:EFColumn enable="false" ename="num" cname="计划数量"/>
<EF:EFColumn enable="false" ename="totalWt" cname="计划重量"/> <EF:EFColumn enable="false" ename="totalWt" cname="计划重量"/>
......
src/main/webapp/HP/SC/HPSC002.js
...@@ -219,42 +219,12 @@ $(function () { ...@@ -219,42 +219,12 @@ $(function () {
return template; return template;
} }
},{ },{
field: "inventRecordId", field: "prdtName",
template: function (dataItem) { query: function (container, options) {
for (let i = 0; i < inventNameGlobalData.length; i++) {
if (inventNameGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
return inventNameGlobalData[i]['textField']+'-'+inventNameGlobalData[i]['param1Field'];
}
}
return "";
},
editor: function (container, options) {
var grid = container.closest(".k-grid").data("kendoGrid");
var cellIndex = grid.cellIndex(container);
var input = $('<input />');
input.attr("name", options.field);
input.attr("id", options.field);
input.appendTo(container);
let eiInfo = new EiInfo(); let eiInfo = new EiInfo();
eiInfo.set("inqu_status-0-inventTypes", [3, 4]); eiInfo.set("inqu_status-0-inventTypes", [3, 4]);
eiInfo.set("inqu_status-0-inventType", options.model["prdtType"]); eiInfo.set("inqu_status-0-inventType", options.model["prdtType"]);
var dataSource; return eiInfo;
EiCommunicator.send("HPPZ006", "queryPrdtComboBox", eiInfo, {
onSuccess: function (ei) {
dataSource = ei.getBlock("invent_prdt_name_block_id").getMappedRows();
inventNameGlobalData = dataSource;
},
onFail: function (ei) {
}
}, {async: false});
input.kendoDropDownList({
valuePrimitive: true,
dataTextField: "textField",
dataParam1Field: "param1Field",
dataValueField: "valueField",
dataSource: dataSource,
template: "#=textField#-#=param1Field#"
});
} }
}, { }, {
field: "parentPrdtName", field: "parentPrdtName",
...@@ -265,21 +235,60 @@ $(function () { ...@@ -265,21 +235,60 @@ $(function () {
return ""; return "";
} }
} }
// {
// field: "inventRecordId",
// template: function (dataItem) {
// for (let i = 0; i < inventNameGlobalData.length; i++) {
// if (inventNameGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
// return inventNameGlobalData[i]['textField']+'-'+inventNameGlobalData[i]['param1Field'];
// }
// }
// return "";
// },
// editor: function (container, options) {
// var grid = container.closest(".k-grid").data("kendoGrid");
// var cellIndex = grid.cellIndex(container);
// var input = $('<input />');
// input.attr("name", options.field);
// input.attr("id", options.field);
// input.appendTo(container);
// let eiInfo = new EiInfo();
// eiInfo.set("inqu_status-0-inventTypes", [3, 4]);
// eiInfo.set("inqu_status-0-inventType", options.model["prdtType"]);
// var dataSource;
// EiCommunicator.send("HPPZ006", "queryPrdtComboBox", eiInfo, {
// onSuccess: function (ei) {
// dataSource = ei.getBlock("invent_prdt_name_block_id").getMappedRows();
// inventNameGlobalData = dataSource;
// },
// onFail: function (ei) {
// }
// }, {async: false});
// input.kendoDropDownList({
// valuePrimitive: true,
// dataTextField: "textField",
// dataParam1Field: "param1Field",
// dataValueField: "valueField",
// dataSource: dataSource,
// template: "#=textField#-#=param1Field#"
// });
// }
// }
], ],
loadComplete: function (grid) { loadComplete: function (grid) {
// 此grid对象 // 此grid对象
grid.dataSource.bind("change", function(e) { // grid.dataSource.bind("change", function(e) {
if (e.field == "inventRecordId") { // if (e.field == "inventRecordId") {
var tr,index; // var tr,index;
// 获取此model元素信息 // // 获取此model元素信息
var item = e.items[0]; // var item = e.items[0];
for (let i = 0; i < inventNameGlobalData.length; i++) { // for (let i = 0; i < inventNameGlobalData.length; i++) {
if (inventNameGlobalData[i]['valueField'] === item.inventRecordId) { // if (inventNameGlobalData[i]['valueField'] === item.inventRecordId) {
resultGrid.setCellValue(item, 'prdtCode', inventNameGlobalData[i]['textField']) // resultGrid.setCellValue(item, 'prdtCode', inventNameGlobalData[i]['textField'])
} // }
} // }
} // }
}); // });
} }
}, },
}; };
......
src/main/webapp/HP/SC/HPSC002.jsp
...@@ -49,8 +49,18 @@ ...@@ -49,8 +49,18 @@
<EF:EFComboColumn cname="部件类型" ename="prdtType" width="90" align="center" required="true"> <EF:EFComboColumn cname="部件类型" ename="prdtType" width="90" align="center" required="true">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="inventRecordId" required="true" cname="部件名称"/> <EF:EFPopupColumn ename="prdtName" cname="部件名称" width="200" popupType="ServiceGrid"
<EF:EFColumn ename="prdtCode" required="true" cname="部件编码" hidden="true"/> popupTitle="部件信息" serviceName="HPPZ006" methodName="queryPrdtComboBox" resultId="invent_prdt_name_block_id"
columnEnames="param1Field,textField"
columnCnames="部件名称,部件编码"
backFillColumnIds="param1Field,textField"
backFillFieldIds="prdtName,prdtCode"
valueField="param1Field" textField="param1Field"/>
<EF:EFColumn ename="prdtCode" cname="部件编码"/>
<EF:EFColumn ename="length" cname="长" format="{0:N3}"/>
<EF:EFColumn ename="width" cname="宽" format="{0:N3}"/>
<EF:EFColumn ename="thick" cname="厚" format="{0:N3}"/>
<EF:EFColumn ename="remark" cname="备注" />
<EF:EFColumn enable="false" ename="parentId" hidden="true" cname="上级部件名称"/> <EF:EFColumn enable="false" ename="parentId" hidden="true" cname="上级部件名称"/>
<EF:EFColumn enable="false" ename="parentPrdtName" cname="上级部件名称"/> <EF:EFColumn enable="false" ename="parentPrdtName" cname="上级部件名称"/>
<EF:EFColumn ename="num" required="true" cname="数量"/> <EF:EFColumn ename="num" required="true" cname="数量"/>
......
src/main/webapp/HP/SC/HPSC003.js
...@@ -42,6 +42,12 @@ $(function () { ...@@ -42,6 +42,12 @@ $(function () {
} }
} }
], ],
onSuccess: function (e) {
if(e.eiInfo.extAttr.methodName == 'update'
||e.eiInfo.extAttr.methodName == 'insert'){
query();
}
},
onRowClick : function(e) { onRowClick : function(e) {
var block = detailGrid.getEiBlock(); var block = detailGrid.getEiBlock();
if (block != null) { if (block != null) {
......
src/main/webapp/HP/SC/HPSC003.jsp
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" readonly="true"/> <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" readonly="true"/>
<EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true"/> <EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true"/>
<EF:EFColumn enable="false" ename="spec" cname="规格" readonly="true"/>
<EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy/MM/dd" width="150" <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy/MM/dd" width="150"
required='true' readonly="true"/> required='true' readonly="true"/>
<EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" readonly="true"/> <EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" readonly="true"/>
...@@ -62,22 +64,22 @@ ...@@ -62,22 +64,22 @@
<EF:EFGrid blockId="detail" autoDraw="no"> <EF:EFGrid blockId="detail" autoDraw="no">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="parentId" cname="父ID" hidden="true"/> <EF:EFColumn ename="parentId" cname="父ID" hidden="true"/>
<EF:EFComboColumn ename="prdtType" cname="零部件类型" width="90" align="center" readonly="true"> <EF:EFComboColumn ename="prdtType" cname="零件类型" width="90" align="center" readonly="true">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" /> <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="零部件编码"/> <EF:EFColumn enable="false" ename="prdtCode" cname="零件编码"/>
<EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="零部件名称"/> <EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="零件名称"/>
<EF:EFColumn enable="false" ename="spec" cname="规格" readonly="true"/>
<EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
<EF:EFComboColumn enable="false" ename="delStatus" cname="状态"> <EF:EFComboColumn enable="false" ename="delStatus" cname="状态">
<EF:EFOption label="已删除" value="0"/> <EF:EFOption label="已删除" value="0"/>
<EF:EFOption label="启用" value="1"/> <EF:EFOption label="启用" value="1"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn enable="false" ename="num" readonly="true" cname="计划数量"/> <EF:EFColumn enable="false" ename="num" readonly="true" cname="计划数量"/>
<EF:EFColumn enable="false" ename="unitWt" readonly="true" cname="计划重量"/> <EF:EFColumn enable="false" ename="unitWt" readonly="true" cname="计划重量"/>
<EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" <EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"/>
width="150"/> <EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" editType="date" dateFormat="yyyy/MM/dd" width="150"/>
<EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" editType="date" <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
dateFormat="yyyy/MM/dd" width="150"/>
<EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
enable="false"/> enable="false"/>
<EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" readonly="true"/> <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" readonly="true"/>
<EF:EFColumn enable="false" ename="actualCompletionUnitWt" cname="实际完工重量" readonly="true"/> <EF:EFColumn enable="false" ename="actualCompletionUnitWt" cname="实际完工重量" readonly="true"/>
...@@ -85,8 +87,6 @@ ...@@ -85,8 +87,6 @@
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
<script> <script>
var ctx = "${ctx}"; var ctx = "${ctx}";
</script> </script>
......
src/main/webapp/HP/SC/HPSC005.jsp
...@@ -37,8 +37,21 @@ ...@@ -37,8 +37,21 @@
<EF:EFColumn enable="false" ename="projCode" cname="项目号" /> <EF:EFColumn enable="false" ename="projCode" cname="项目号" />
<EF:EFColumn enable="false" ename="projName" cname="项目名称"/> <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
<EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/> <EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/>
<EF:EFColumn enable="false" ename="prdtCode" cname="零部件编码"/> <EF:EFComboColumn ename="prdtType" cname="部件类型" width="90" align="center" enable="false">
<EF:EFColumn enable="false" ename="prdtName" cname="零部件名称"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/>
<EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/>
<EF:EFColumn enable="false" ename="prdtSpec" cname="部件规格"/>
<EF:EFColumn enable="false" ename="remark" cname="部件备注"/>
<EF:EFComboColumn ename="partType" cname="零件类型" width="90" align="center" enable="false">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="partCode" cname="零件编码"/>
<EF:EFColumn enable="false" ename="partName" cname="零件名称"/>
<EF:EFColumn enable="false" ename="partSpec" cname="零件规格"/>
<EF:EFColumn enable="false" ename="remark1" cname="零件备注"/>
<EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/> <EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/>
<EF:EFColumn enable="false" ename="num" cname="计划数量"/> <EF:EFColumn enable="false" ename="num" cname="计划数量"/>
<EF:EFColumn enable="false" ename="totalWt" cname="计划重量"/> <EF:EFColumn enable="false" ename="totalWt" cname="计划重量"/>
......
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