Skip to content

H
hp-smart
Commit c29ad7c9 by wasx8023
Options

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

parents a69fb493 3ac63992
Showing with 399 additions and 61 deletions
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ014.java
...@@ -8,12 +8,15 @@ import com.baosight.hpjx.hp.constant.HPSqlConstant; ...@@ -8,12 +8,15 @@ import com.baosight.hpjx.hp.constant.HPSqlConstant;
import com.baosight.hpjx.hp.pz.domain.HPPZ013; import com.baosight.hpjx.hp.pz.domain.HPPZ013;
import com.baosight.hpjx.hp.pz.domain.HPPZ014; import com.baosight.hpjx.hp.pz.domain.HPPZ014;
import com.baosight.hpjx.hp.pz.domain.HPPZ01401; import com.baosight.hpjx.hp.pz.domain.HPPZ01401;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.hp.sc.domain.HPSC003;
import com.baosight.hpjx.hp.xs.tools.HPXSTools; import com.baosight.hpjx.hp.xs.tools.HPXSTools;
import com.baosight.hpjx.util.AssertUtils; import com.baosight.hpjx.util.AssertUtils;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.DateUtils; import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.EiInfoUtils; import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiConstant; 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;
...@@ -63,6 +66,10 @@ public class ServiceHPPZ014 extends ServiceBase { ...@@ -63,6 +66,10 @@ public class ServiceHPPZ014 extends ServiceBase {
@OperationLogAnnotation(operModul = "用工登记", operType = "查询", operDesc = "查询") @OperationLogAnnotation(operModul = "用工登记", operType = "查询", operDesc = "查询")
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "regDateFrom",
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "regDateFrom")));
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "regDateTo",
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "regDateTo")));
inInfo = super.query(inInfo, HPPZ014.QUERY, new HPPZ01401()); inInfo = super.query(inInfo, HPPZ014.QUERY, new HPPZ01401());
// 设置用户信息 // 设置用户信息
HPXSTools.XsUser.setUserInfo(inInfo, HPPZ01401.FIELD_USER_ID); HPXSTools.XsUser.setUserInfo(inInfo, HPPZ01401.FIELD_USER_ID);
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ014.xml
...@@ -94,6 +94,12 @@ ...@@ -94,6 +94,12 @@
<isNotEmpty prepend=" AND " property="manHour"> <isNotEmpty prepend=" AND " property="manHour">
MAN_HOUR = #manHour# MAN_HOUR = #manHour#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="regDateFrom">
REG_DATE >= #regDateFrom#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="regDateTo">
REG_DATE &lt;= #regDateTo#
</isNotEmpty>
</sql> </sql>
<sql id="customCondition"> <sql id="customCondition">
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC001.java
...@@ -10,6 +10,10 @@ import java.util.Map; ...@@ -10,6 +10,10 @@ import java.util.Map;
public class HPSC001 extends DaoEPBase { public class HPSC001 extends DaoEPBase {
public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String COL_DELIVERY_DATE = "deliveryDate";
private Long id = 0L; private Long id = 0L;
private String companyCode = " "; /* 企业编码 预留*/ private String companyCode = " "; /* 企业编码 预留*/
private Integer projType = 0; /* 项目类型*/ private Integer projType = 0; /* 项目类型*/
...@@ -17,6 +21,7 @@ public class HPSC001 extends DaoEPBase { ...@@ -17,6 +21,7 @@ public class HPSC001 extends DaoEPBase {
private String projName = " "; /* 项目名称*/ private String projName = " "; /* 项目名称*/
private String princ1 = " "; /* 本公司项目负责人*/ private String princ1 = " "; /* 本公司项目负责人*/
private String princ2 = " "; /* 客户项目负责人*/ private String princ2 = " "; /* 客户项目负责人*/
private String deliveryDate = " ";
private Integer status = 0; /* 状态 0-未提交，1-已提交*/ private Integer status = 0; /* 状态 0-未提交，1-已提交*/
private String createdBy = " "; /* 创建人*/ private String createdBy = " "; /* 创建人*/
private String createdName = " "; /* 创建人名称*/ private String createdName = " "; /* 创建人名称*/
...@@ -63,6 +68,10 @@ public class HPSC001 extends DaoEPBase { ...@@ -63,6 +68,10 @@ public class HPSC001 extends DaoEPBase {
eiColumn.setDescName("客户项目负责人"); eiColumn.setDescName("客户项目负责人");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("deliveryDate");
eiColumn.setDescName("交货日期");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("status"); eiColumn = new EiColumn("status");
eiColumn.setDescName("状态 0-未提交，1-已提交"); eiColumn.setDescName("状态 0-未提交，1-已提交");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
...@@ -208,6 +217,15 @@ public class HPSC001 extends DaoEPBase { ...@@ -208,6 +217,15 @@ public class HPSC001 extends DaoEPBase {
public void setPrinc2(String princ2) { public void setPrinc2(String princ2) {
this.princ2 = princ2; this.princ2 = princ2;
} }
public String getDeliveryDate() {
return deliveryDate;
}
public void setDeliveryDate(String deliveryDate) {
this.deliveryDate = deliveryDate;
}
/** /**
* get the status - 状态 0-未提交，1-已提交 * get the status - 状态 0-未提交，1-已提交
* @return the status * @return the status
...@@ -349,6 +367,7 @@ public class HPSC001 extends DaoEPBase { ...@@ -349,6 +367,7 @@ public class HPSC001 extends DaoEPBase {
setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("projName")), projName)); setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("projName")), projName));
setPrinc1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("princ1")), princ1)); setPrinc1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("princ1")), princ1));
setPrinc2(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("princ2")), princ2)); setPrinc2(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("princ2")), princ2));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("deliveryDate")), deliveryDate));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get("status")), status)); setStatus(NumberUtils.toInteger(StringUtils.toString(map.get("status")), status));
setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdBy")), createdBy)); setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdBy")), createdBy));
setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdName")), createdName)); setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdName")), createdName));
...@@ -375,6 +394,7 @@ public class HPSC001 extends DaoEPBase { ...@@ -375,6 +394,7 @@ public class HPSC001 extends DaoEPBase {
map.put("projName",StringUtils.toString(projName, eiMetadata.getMeta("projName"))); map.put("projName",StringUtils.toString(projName, eiMetadata.getMeta("projName")));
map.put("princ1",StringUtils.toString(princ1, eiMetadata.getMeta("princ1"))); map.put("princ1",StringUtils.toString(princ1, eiMetadata.getMeta("princ1")));
map.put("princ2",StringUtils.toString(princ2, eiMetadata.getMeta("princ2"))); map.put("princ2",StringUtils.toString(princ2, eiMetadata.getMeta("princ2")));
map.put("deliveryDate",StringUtils.toString(deliveryDate, eiMetadata.getMeta("deliveryDate")));
map.put("status",StringUtils.toString(status, eiMetadata.getMeta("status"))); map.put("status",StringUtils.toString(status, eiMetadata.getMeta("status")));
map.put("createdBy",StringUtils.toString(createdBy, eiMetadata.getMeta("createdBy"))); map.put("createdBy",StringUtils.toString(createdBy, eiMetadata.getMeta("createdBy")));
map.put("createdName",StringUtils.toString(createdName, eiMetadata.getMeta("createdName"))); map.put("createdName",StringUtils.toString(createdName, eiMetadata.getMeta("createdName")));
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002.java
...@@ -60,6 +60,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -60,6 +60,7 @@ public class HPSC002 extends DaoEPBase {
public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 更新时间*/ public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 更新时间*/
public static final String FIELD_REMARK = "remark"; /* 备注*/ public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_PGSTATUS = "pgStatus"; /* 派工状态*/ public static final String FIELD_PGSTATUS = "pgStatus"; /* 派工状态*/
public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String FIELD_LV = "lv"; /* 树的层级*/ public static final String FIELD_LV = "lv"; /* 树的层级*/
...@@ -102,6 +103,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -102,6 +103,7 @@ public class HPSC002 extends DaoEPBase {
public static final String COL_PGSTATUS = "PGSTATUS"; /* 派工状态*/ public static final String COL_PGSTATUS = "PGSTATUS"; /* 派工状态*/
public static final String COL_LV = "LV"; /* 树的层级*/ public static final String COL_LV = "LV"; /* 树的层级*/
public static final String COL_DELIVERY_DATE = "DELIVERY_DATE";
public static final String QUERY = "HPSC002.query"; public static final String QUERY = "HPSC002.query";
public static final String COUNT = "HPSC002.count"; public static final String COUNT = "HPSC002.count";
...@@ -156,6 +158,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -156,6 +158,7 @@ public class HPSC002 extends DaoEPBase {
private String pgStatus = " "; /* 派工状态*/ private String pgStatus = " "; /* 派工状态*/
private Integer lv; /* 树的层级*/ private Integer lv; /* 树的层级*/
private String deliveryDate = " ";
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -333,6 +336,10 @@ public class HPSC002 extends DaoEPBase { ...@@ -333,6 +336,10 @@ public class HPSC002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_PGSTATUS); eiColumn = new EiColumn(FIELD_PGSTATUS);
eiColumn.setDescName("派工状态"); eiColumn.setDescName("派工状态");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVERY_DATE);
eiColumn.setDescName("交货状态");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -952,6 +959,14 @@ public class HPSC002 extends DaoEPBase { ...@@ -952,6 +959,14 @@ public class HPSC002 extends DaoEPBase {
this.pgStatus = pgStatus; this.pgStatus = pgStatus;
} }
public String getDeliveryDate() {
return deliveryDate;
}
public void setDeliveryDate(String deliveryDate) {
this.deliveryDate = deliveryDate;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -999,6 +1014,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -999,6 +1014,7 @@ public class HPSC002 extends DaoEPBase {
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark)); setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
setLv(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_LV)), lv)); setLv(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_LV)), lv));
setPgStatus(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PGSTATUS)), pgStatus)); setPgStatus(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PGSTATUS)), pgStatus));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
} }
/** /**
...@@ -1046,6 +1062,7 @@ public class HPSC002 extends DaoEPBase { ...@@ -1046,6 +1062,7 @@ public class HPSC002 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_LV, StringUtils.toString(lv, eiMetadata.getMeta(FIELD_LV))); map.put(FIELD_LV, StringUtils.toString(lv, eiMetadata.getMeta(FIELD_LV)));
map.put(FIELD_PGSTATUS, StringUtils.toString(pgStatus, eiMetadata.getMeta(FIELD_PGSTATUS))); map.put(FIELD_PGSTATUS, StringUtils.toString(pgStatus, eiMetadata.getMeta(FIELD_PGSTATUS)));
map.put(FIELD_DELIVERY_DATE,StringUtils.toString(deliveryDate,eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
return map; return map;
} }
} }
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC003.java
...@@ -41,6 +41,7 @@ public class HPSC003 extends DaoEPBase { ...@@ -41,6 +41,7 @@ public class HPSC003 extends DaoEPBase {
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/ public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
public static final String FIELD_REMARK = "remark"; /* 备注*/ public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_SCHEDULE = "schedule"; public static final String FIELD_SCHEDULE = "schedule";
public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String FIELD_INVENT_RECORD_ID = "inventRecordId"; public static final String FIELD_INVENT_RECORD_ID = "inventRecordId";
...@@ -63,6 +64,7 @@ public class HPSC003 extends DaoEPBase { ...@@ -63,6 +64,7 @@ public class HPSC003 extends DaoEPBase {
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/ public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
public static final String COL_REMARK = "REMARK"; /* 备注*/ public static final String COL_REMARK = "REMARK"; /* 备注*/
public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID"; public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID";
public static final String COL_DELIVERY_DATE = "DELIVERY_DATE";
public static final String QUERY = "HPSC003.query"; public static final String QUERY = "HPSC003.query";
public static final String COUNT = "HPSC003.count"; public static final String COUNT = "HPSC003.count";
...@@ -90,6 +92,7 @@ public class HPSC003 extends DaoEPBase { ...@@ -90,6 +92,7 @@ public class HPSC003 extends DaoEPBase {
private Long matId = null; /* 物料ID*/ private Long matId = null; /* 物料ID*/
private String schedule = ""; private String schedule = "";
private String deliveryDate = " ";
private Long inventRecordId = new Long(0); private Long inventRecordId = new Long(0);
...@@ -212,6 +215,10 @@ public class HPSC003 extends DaoEPBase { ...@@ -212,6 +215,10 @@ public class HPSC003 extends DaoEPBase {
eiColumn.setDescName("物料ID"); eiColumn.setDescName("物料ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVERY_DATE);
eiColumn.setDescName("交货日期");
eiMetadata.addMeta(eiColumn);
} }
...@@ -575,6 +582,14 @@ public class HPSC003 extends DaoEPBase { ...@@ -575,6 +582,14 @@ public class HPSC003 extends DaoEPBase {
this.matId = matId; this.matId = matId;
} }
public String getDeliveryDate() {
return deliveryDate;
}
public void setDeliveryDate(String deliveryDate) {
this.deliveryDate = deliveryDate;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -607,6 +622,7 @@ public class HPSC003 extends DaoEPBase { ...@@ -607,6 +622,7 @@ public class HPSC003 extends DaoEPBase {
setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("width")), width)); setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("width")), width));
setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("thick")), thick)); setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("thick")), thick));
setMatId(NumberUtils.toLong(StringUtils.toString(map.get("matId")), matId)); setMatId(NumberUtils.toLong(StringUtils.toString(map.get("matId")), matId));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
} }
...@@ -641,6 +657,7 @@ public class HPSC003 extends DaoEPBase { ...@@ -641,6 +657,7 @@ public class HPSC003 extends DaoEPBase {
map.put("width", StringUtils.toString(width, eiMetadata.getMeta("width"))); map.put("width", StringUtils.toString(width, eiMetadata.getMeta("width")));
map.put("thick", StringUtils.toString(thick, eiMetadata.getMeta("thick"))); map.put("thick", StringUtils.toString(thick, eiMetadata.getMeta("thick")));
map.put("matId", StringUtils.toString(matId, eiMetadata.getMeta("matId"))); map.put("matId", StringUtils.toString(matId, eiMetadata.getMeta("matId")));
map.put(FIELD_DELIVERY_DATE, StringUtils.toString(deliveryDate, eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
...@@ -66,6 +66,7 @@ public class HPSC004 extends DaoEPBase { ...@@ -66,6 +66,7 @@ public class HPSC004 extends DaoEPBase {
public static final String FIELD_UPDATED_NAME = "updatedName"; /* 修改人名称*/ public static final String FIELD_UPDATED_NAME = "updatedName"; /* 修改人名称*/
public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 更新时间*/ public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 更新时间*/
public static final String FIELD_DEL_STATUS = "delStatus"; /* 状态:0未删除，1已删除*/ public static final String FIELD_DEL_STATUS = "delStatus"; /* 状态:0未删除，1已删除*/
public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/ public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/
...@@ -111,6 +112,7 @@ public class HPSC004 extends DaoEPBase { ...@@ -111,6 +112,7 @@ public class HPSC004 extends DaoEPBase {
public static final String COL_UPDATED_NAME = "UPDATED_NAME"; /* 修改人名称*/ public static final String COL_UPDATED_NAME = "UPDATED_NAME"; /* 修改人名称*/
public static final String COL_UPDATED_TIME = "UPDATED_TIME"; /* 更新时间*/ public static final String COL_UPDATED_TIME = "UPDATED_TIME"; /* 更新时间*/
public static final String COL_DEL_STATUS = "DEL_STATUS"; /* 状态:0未删除，1已删除*/ public static final String COL_DEL_STATUS = "DEL_STATUS"; /* 状态:0未删除，1已删除*/
public static final String COL_DELIVERY_DATE = "DELIVERY_DATE";
public static final String QUERY = "HPSC004.query"; public static final String QUERY = "HPSC004.query";
public static final String COUNT = "HPSC004.count"; public static final String COUNT = "HPSC004.count";
...@@ -162,6 +164,7 @@ public class HPSC004 extends DaoEPBase { ...@@ -162,6 +164,7 @@ public class HPSC004 extends DaoEPBase {
private String updatedName = " "; /* 修改人名称*/ private String updatedName = " "; /* 修改人名称*/
private String updatedTime = " "; /* 更新时间*/ private String updatedTime = " "; /* 更新时间*/
private Integer delStatus; /* 状态:0未删除，1已删除*/ private Integer delStatus; /* 状态:0未删除，1已删除*/
private String deliveryDate = " ";
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -370,6 +373,10 @@ public class HPSC004 extends DaoEPBase { ...@@ -370,6 +373,10 @@ public class HPSC004 extends DaoEPBase {
eiColumn.setDescName("状态:0未删除，1已删除"); eiColumn.setDescName("状态:0未删除，1已删除");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVERY_DATE);
eiColumn.setDescName("交货日期");
eiMetadata.addMeta(eiColumn);
} }
...@@ -1084,6 +1091,14 @@ public class HPSC004 extends DaoEPBase { ...@@ -1084,6 +1091,14 @@ public class HPSC004 extends DaoEPBase {
public void setDelStatus(Integer delStatus) { public void setDelStatus(Integer delStatus) {
this.delStatus = delStatus; this.delStatus = delStatus;
} }
public String getDeliveryDate() {
return deliveryDate;
}
public void setDeliveryDate(String deliveryDate) {
this.deliveryDate = deliveryDate;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -1136,6 +1151,7 @@ public class HPSC004 extends DaoEPBase { ...@@ -1136,6 +1151,7 @@ public class HPSC004 extends DaoEPBase {
setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName)); setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime)); setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
setDelStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DEL_STATUS)), delStatus)); setDelStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DEL_STATUS)), delStatus));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
} }
/** /**
...@@ -1189,6 +1205,7 @@ public class HPSC004 extends DaoEPBase { ...@@ -1189,6 +1205,7 @@ public class HPSC004 extends DaoEPBase {
map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME))); map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
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_DEL_STATUS, StringUtils.toString(delStatus, eiMetadata.getMeta(FIELD_DEL_STATUS))); map.put(FIELD_DEL_STATUS, StringUtils.toString(delStatus, eiMetadata.getMeta(FIELD_DEL_STATUS)));
map.put(FIELD_DELIVERY_DATE, StringUtils.toString(deliveryDate, eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005.java
...@@ -43,6 +43,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -43,6 +43,7 @@ public class HPSC005 extends DaoEPBase {
public static final String FIELD_PART_WIDTH = "partWidth"; /* 零件-宽*/ public static final String FIELD_PART_WIDTH = "partWidth"; /* 零件-宽*/
public static final String FIELD_PART_THICK = "partThick"; /* 零件-厚*/ public static final String FIELD_PART_THICK = "partThick"; /* 零件-厚*/
public static final String FIELD_PART_SPEC = "partSpec"; /* 零件规格*/ public static final String FIELD_PART_SPEC = "partSpec"; /* 零件规格*/
public static final String FIELD_WORK_DATE = "workDate";
public static final String FIELD_PLAN_COMPLETION_DATE = "planCompletionDate"; /* 计划完成日期*/ public static final String FIELD_PLAN_COMPLETION_DATE = "planCompletionDate"; /* 计划完成日期*/
public static final String FIELD_NUM = "num"; /* 计划数量*/ public static final String FIELD_NUM = "num"; /* 计划数量*/
public static final String FIELD_UNIT_WT = "unitWt"; /* 计划单重*/ public static final String FIELD_UNIT_WT = "unitWt"; /* 计划单重*/
...@@ -70,6 +71,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -70,6 +71,7 @@ public class HPSC005 extends DaoEPBase {
public static final String FIELD_FILE_PATH5 = "filePath5"; /* 文件地址5*/ public static final String FIELD_FILE_PATH5 = "filePath5"; /* 文件地址5*/
public static final String FIELD_INVENT_RECORD_ID = "inventRecordId"; /* 存货档案ID*/ public static final String FIELD_INVENT_RECORD_ID = "inventRecordId"; /* 存货档案ID*/
public static final String FIELD_MAT_ID = "matId"; /* 材料ID*/ public static final String FIELD_MAT_ID = "matId"; /* 材料ID*/
public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String COL_MAT_ID = "MAT_ID"; /* 材料ID*/ public static final String COL_MAT_ID = "MAT_ID"; /* 材料ID*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
...@@ -92,6 +94,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -92,6 +94,7 @@ public class HPSC005 extends DaoEPBase {
public static final String COL_PART_WIDTH = "PART_WIDTH"; /* 零件-宽*/ public static final String COL_PART_WIDTH = "PART_WIDTH"; /* 零件-宽*/
public static final String COL_PART_THICK = "PART_THICK"; /* 零件-厚*/ public static final String COL_PART_THICK = "PART_THICK"; /* 零件-厚*/
public static final String COL_PART_SPEC = "PART_SPEC"; /* 零件规格*/ public static final String COL_PART_SPEC = "PART_SPEC"; /* 零件规格*/
public static final String COL_WORK_DATE = "WORK_DATE";
public static final String COL_PLAN_COMPLETION_DATE = "PLAN_COMPLETION_DATE"; /* 计划完成日期*/ public static final String COL_PLAN_COMPLETION_DATE = "PLAN_COMPLETION_DATE"; /* 计划完成日期*/
public static final String COL_NUM = "NUM"; /* 计划数量*/ public static final String COL_NUM = "NUM"; /* 计划数量*/
public static final String COL_UNIT_WT = "UNIT_WT"; /* 计划单重*/ public static final String COL_UNIT_WT = "UNIT_WT"; /* 计划单重*/
...@@ -118,6 +121,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -118,6 +121,7 @@ public class HPSC005 extends DaoEPBase {
public static final String COL_FILE_PATH4 = "FILE_PATH4"; /* 文件地址4*/ public static final String COL_FILE_PATH4 = "FILE_PATH4"; /* 文件地址4*/
public static final String COL_FILE_PATH5 = "FILE_PATH5"; /* 文件地址5*/ public static final String COL_FILE_PATH5 = "FILE_PATH5"; /* 文件地址5*/
public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID"; /* 存货档案ID*/ public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID"; /* 存货档案ID*/
public static final String COL_DELIVERY_DATE = "DELIVERY_DATE";
public static final String QUERY = "HPSC005.query"; public static final String QUERY = "HPSC005.query";
public static final String COUNT = "HPSC005.count"; public static final String COUNT = "HPSC005.count";
...@@ -145,6 +149,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -145,6 +149,7 @@ public class HPSC005 extends DaoEPBase {
private BigDecimal partWidth = new BigDecimal("0"); /* 零件-宽*/ private BigDecimal partWidth = new BigDecimal("0"); /* 零件-宽*/
private BigDecimal partThick = new BigDecimal("0"); /* 零件-厚*/ private BigDecimal partThick = new BigDecimal("0"); /* 零件-厚*/
private String partSpec = " "; /* 零件规格*/ private String partSpec = " "; /* 零件规格*/
private String workDate = " ";
private String planCompletionDate = " "; /* 计划完成日期*/ private String planCompletionDate = " "; /* 计划完成日期*/
private BigDecimal num = new BigDecimal(0.000); /* 计划数量*/ private BigDecimal num = new BigDecimal(0.000); /* 计划数量*/
private BigDecimal unitWt = new BigDecimal("0"); /* 计划单重*/ private BigDecimal unitWt = new BigDecimal("0"); /* 计划单重*/
...@@ -172,6 +177,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -172,6 +177,7 @@ public class HPSC005 extends DaoEPBase {
private String filePath5 = " "; /* 文件地址5*/ private String filePath5 = " "; /* 文件地址5*/
private Long inventRecordId; /* 存货档案ID*/ private Long inventRecordId; /* 存货档案ID*/
private Long matId; /* 材料ID*/ private Long matId; /* 材料ID*/
private String deliveryDate = " ";
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -278,6 +284,10 @@ public class HPSC005 extends DaoEPBase { ...@@ -278,6 +284,10 @@ public class HPSC005 extends DaoEPBase {
eiColumn.setDescName("零件规格"); eiColumn.setDescName("零件规格");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_WORK_DATE);
eiColumn.setDescName("派工时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PLAN_COMPLETION_DATE); eiColumn = new EiColumn(FIELD_PLAN_COMPLETION_DATE);
eiColumn.setDescName("计划完成日期"); eiColumn.setDescName("计划完成日期");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
...@@ -400,6 +410,10 @@ public class HPSC005 extends DaoEPBase { ...@@ -400,6 +410,10 @@ public class HPSC005 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_MAT_ID); eiColumn = new EiColumn(FIELD_MAT_ID);
eiColumn.setDescName("材料ID"); eiColumn.setDescName("材料ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVERY_DATE);
eiColumn.setDescName("交货日期");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -729,6 +743,15 @@ public class HPSC005 extends DaoEPBase { ...@@ -729,6 +743,15 @@ public class HPSC005 extends DaoEPBase {
public void setPartSpec(String partSpec) { public void setPartSpec(String partSpec) {
this.partSpec = partSpec; this.partSpec = partSpec;
} }
public String getWorkDate() {
return workDate;
}
public void setWorkDate(String workDate) {
this.workDate = workDate;
}
/** /**
* get the planCompletionDate - 计划完成日期. * get the planCompletionDate - 计划完成日期.
* @return the planCompletionDate * @return the planCompletionDate
...@@ -1161,6 +1184,15 @@ public class HPSC005 extends DaoEPBase { ...@@ -1161,6 +1184,15 @@ public class HPSC005 extends DaoEPBase {
public void setMatId(Long matId) { public void setMatId(Long matId) {
this.matId = matId; this.matId = matId;
} }
public String getDeliveryDate() {
return deliveryDate;
}
public void setDeliveryDate(String deliveryDate) {
this.deliveryDate = deliveryDate;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -1189,6 +1221,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -1189,6 +1221,7 @@ public class HPSC005 extends DaoEPBase {
setPartWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_WIDTH)), partWidth)); setPartWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_WIDTH)), partWidth));
setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_THICK)), partThick)); setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_THICK)), partThick));
setPartSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_SPEC)), partSpec)); setPartSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_SPEC)), partSpec));
setWorkDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WORK_DATE)), workDate));
setPlanCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_COMPLETION_DATE)), planCompletionDate)); setPlanCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_COMPLETION_DATE)), planCompletionDate));
setNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_NUM)), num)); setNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_NUM)), num));
setUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UNIT_WT)), unitWt)); setUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UNIT_WT)), unitWt));
...@@ -1216,6 +1249,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -1216,6 +1249,7 @@ public class HPSC005 extends DaoEPBase {
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));
setMatId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_MAT_ID)), matId)); setMatId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_MAT_ID)), matId));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
} }
...@@ -1246,6 +1280,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -1246,6 +1280,7 @@ public class HPSC005 extends DaoEPBase {
map.put(FIELD_PART_WIDTH, StringUtils.toString(partWidth, eiMetadata.getMeta(FIELD_PART_WIDTH))); map.put(FIELD_PART_WIDTH, StringUtils.toString(partWidth, eiMetadata.getMeta(FIELD_PART_WIDTH)));
map.put(FIELD_PART_THICK, StringUtils.toString(partThick, eiMetadata.getMeta(FIELD_PART_THICK))); map.put(FIELD_PART_THICK, StringUtils.toString(partThick, eiMetadata.getMeta(FIELD_PART_THICK)));
map.put(FIELD_PART_SPEC, StringUtils.toString(partSpec, eiMetadata.getMeta(FIELD_PART_SPEC))); map.put(FIELD_PART_SPEC, StringUtils.toString(partSpec, eiMetadata.getMeta(FIELD_PART_SPEC)));
map.put(FIELD_WORK_DATE, StringUtils.toString(workDate, eiMetadata.getMeta(FIELD_WORK_DATE)));
map.put(FIELD_PLAN_COMPLETION_DATE, StringUtils.toString(planCompletionDate, eiMetadata.getMeta(FIELD_PLAN_COMPLETION_DATE))); map.put(FIELD_PLAN_COMPLETION_DATE, StringUtils.toString(planCompletionDate, eiMetadata.getMeta(FIELD_PLAN_COMPLETION_DATE)));
map.put(FIELD_NUM, StringUtils.toString(num, eiMetadata.getMeta(FIELD_NUM))); map.put(FIELD_NUM, StringUtils.toString(num, eiMetadata.getMeta(FIELD_NUM)));
map.put(FIELD_UNIT_WT, StringUtils.toString(unitWt, eiMetadata.getMeta(FIELD_UNIT_WT))); map.put(FIELD_UNIT_WT, StringUtils.toString(unitWt, eiMetadata.getMeta(FIELD_UNIT_WT)));
...@@ -1273,6 +1308,7 @@ public class HPSC005 extends DaoEPBase { ...@@ -1273,6 +1308,7 @@ public class HPSC005 extends DaoEPBase {
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(FIELD_MAT_ID, StringUtils.toString(matId, eiMetadata.getMeta(FIELD_MAT_ID))); map.put(FIELD_MAT_ID, StringUtils.toString(matId, eiMetadata.getMeta(FIELD_MAT_ID)));
map.put(FIELD_DELIVERY_DATE, StringUtils.toString(deliveryDate, eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005C.java
...@@ -73,6 +73,7 @@ public class HPSC005C extends DaoEPBase { ...@@ -73,6 +73,7 @@ public class HPSC005C extends DaoEPBase {
public static final String FIELD_UN_TOTAL_WT = "unTotalWt"; /* 剩余重量*/ public static final String FIELD_UN_TOTAL_WT = "unTotalWt"; /* 剩余重量*/
public static final String FIELD_ACTUAL_COMPLETION_DATE = "actualCompletionDate"; /* 实际完工日期*/ public static final String FIELD_ACTUAL_COMPLETION_DATE = "actualCompletionDate"; /* 实际完工日期*/
public static final String FIELD_ACTUAL_COMPLETION_TOTAL_WT = "actualCompletionTotalWt"; /* 实际完工重量*/ public static final String FIELD_ACTUAL_COMPLETION_TOTAL_WT = "actualCompletionTotalWt"; /* 实际完工重量*/
public static final String FIELD_DELIVERY_DATE = "deliveryDate";
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/ public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/
...@@ -124,6 +125,7 @@ public class HPSC005C extends DaoEPBase { ...@@ -124,6 +125,7 @@ public class HPSC005C extends DaoEPBase {
public static final String COL_UN_TOTAL_WT = "UN_TOTAL_WT"; /* 剩余重量*/ public static final String COL_UN_TOTAL_WT = "UN_TOTAL_WT"; /* 剩余重量*/
public static final String COL_ACTUAL_COMPLETION_DATE = "ACTUAL_COMPLETION_DATE"; /* 实际完工日期*/ public static final String COL_ACTUAL_COMPLETION_DATE = "ACTUAL_COMPLETION_DATE"; /* 实际完工日期*/
public static final String COL_ACTUAL_COMPLETION_TOTAL_WT = "ACTUAL_COMPLETION_TOTAL_WT"; /* 实际完工重量*/ public static final String COL_ACTUAL_COMPLETION_TOTAL_WT = "ACTUAL_COMPLETION_TOTAL_WT"; /* 实际完工重量*/
public static final String COL_DELIVERY_DATE = "DELIVERY_DATE";
public static final String QUERY = "HPSC005C.query"; public static final String QUERY = "HPSC005C.query";
...@@ -173,6 +175,7 @@ public class HPSC005C extends DaoEPBase { ...@@ -173,6 +175,7 @@ public class HPSC005C extends DaoEPBase {
private String filePath4 = " "; /* 文件地址4*/ private String filePath4 = " "; /* 文件地址4*/
private String filePath5 = " "; /* 文件地址5*/ private String filePath5 = " "; /* 文件地址5*/
private Long inventRecordId; /* 存货档案ID*/ private Long inventRecordId; /* 存货档案ID*/
private String deliveryDate = " ";
//详情 //详情
private BigDecimal completeNum = new BigDecimal("0"); /* 已完成数量*/ private BigDecimal completeNum = new BigDecimal("0"); /* 已完成数量*/
private BigDecimal unTotalWt = new BigDecimal("0"); /* 剩余重量*/ private BigDecimal unTotalWt = new BigDecimal("0"); /* 剩余重量*/
...@@ -426,6 +429,10 @@ public class HPSC005C extends DaoEPBase { ...@@ -426,6 +429,10 @@ public class HPSC005C extends DaoEPBase {
eiColumn.setFieldLength(15); eiColumn.setFieldLength(15);
eiColumn.setDescName("实际完工重量"); eiColumn.setDescName("实际完工重量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVERY_DATE);
eiColumn.setDescName("交货日期");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -1205,6 +1212,14 @@ public class HPSC005C extends DaoEPBase { ...@@ -1205,6 +1212,14 @@ public class HPSC005C extends DaoEPBase {
this.actualCompletionTotalWt = actualCompletionTotalWt; this.actualCompletionTotalWt = actualCompletionTotalWt;
} }
public String getDeliveryDate() {
return deliveryDate;
}
public void setDeliveryDate(String deliveryDate) {
this.deliveryDate = deliveryDate;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -1263,6 +1278,7 @@ public class HPSC005C extends DaoEPBase { ...@@ -1263,6 +1278,7 @@ public class HPSC005C extends DaoEPBase {
setUnTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UN_TOTAL_WT)), unTotalWt)); setUnTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UN_TOTAL_WT)), unTotalWt));
setActualCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_DATE)), actualCompletionDate)); setActualCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_DATE)), actualCompletionDate));
setActualCompletionTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_TOTAL_WT)), actualCompletionTotalWt)); setActualCompletionTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_TOTAL_WT)), actualCompletionTotalWt));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
} }
/** /**
...@@ -1322,6 +1338,7 @@ public class HPSC005C extends DaoEPBase { ...@@ -1322,6 +1338,7 @@ public class HPSC005C extends DaoEPBase {
map.put(FIELD_UN_TOTAL_WT, StringUtils.toString(unTotalWt, eiMetadata.getMeta(FIELD_UN_TOTAL_WT))); map.put(FIELD_UN_TOTAL_WT, StringUtils.toString(unTotalWt, eiMetadata.getMeta(FIELD_UN_TOTAL_WT)));
map.put(FIELD_ACTUAL_COMPLETION_DATE, StringUtils.toString(actualCompletionDate, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_DATE))); map.put(FIELD_ACTUAL_COMPLETION_DATE, StringUtils.toString(actualCompletionDate, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_DATE)));
map.put(FIELD_ACTUAL_COMPLETION_TOTAL_WT, StringUtils.toString(actualCompletionTotalWt, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_TOTAL_WT))); map.put(FIELD_ACTUAL_COMPLETION_TOTAL_WT, StringUtils.toString(actualCompletionTotalWt, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_TOTAL_WT)));
map.put(FIELD_DELIVERY_DATE, StringUtils.toString(deliveryDate, eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
return map; return map;
} }
} }
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC006.java
...@@ -62,6 +62,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -62,6 +62,7 @@ public class HPSC006 extends DaoEPBase {
public static final String FIELD_CUT_SCHEDULE = "cutSchedule"; /*下料进度*/ public static final String FIELD_CUT_SCHEDULE = "cutSchedule"; /*下料进度*/
public static final String FIELD_REQ_NUM = "reqNum"; /*领料记录*/ public static final String FIELD_REQ_NUM = "reqNum"; /*领料记录*/
public static final String FIELD_DELIVERY_DATE = "deliveryDate";
...@@ -102,6 +103,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -102,6 +103,7 @@ public class HPSC006 extends DaoEPBase {
public static final String COL_PART_NAME = "PART_NAME"; /* 零件名称*/ public static final String COL_PART_NAME = "PART_NAME"; /* 零件名称*/
public static final String COL_CUT_SCHEDULE = "CUT_SCHEDULE"; /* 下料进度*/ public static final String COL_CUT_SCHEDULE = "CUT_SCHEDULE"; /* 下料进度*/
public static final String COL_REQ_NUM = "REQ_NUM"; /* 领料记录*/ public static final String COL_REQ_NUM = "REQ_NUM"; /* 领料记录*/
public static final String COL_DELIVERY_DATE = "DELIVERY_DATE";
public static final String QUERY = "HPSC006.query"; public static final String QUERY = "HPSC006.query";
...@@ -158,6 +160,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -158,6 +160,7 @@ public class HPSC006 extends DaoEPBase {
private String cutSchedule = ""; private String cutSchedule = "";
private Integer reqNum = new Integer(0); private Integer reqNum = new Integer(0);
private String deliveryDate = " ";
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -337,6 +340,10 @@ public class HPSC006 extends DaoEPBase { ...@@ -337,6 +340,10 @@ public class HPSC006 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_REQ_NUM); eiColumn = new EiColumn(FIELD_REQ_NUM);
eiColumn.setDescName("领料记录"); eiColumn.setDescName("领料记录");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELIVERY_DATE);
eiColumn.setDescName("交货日期");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -933,6 +940,14 @@ public class HPSC006 extends DaoEPBase { ...@@ -933,6 +940,14 @@ public class HPSC006 extends DaoEPBase {
this.reqNum = reqNum; this.reqNum = reqNum;
} }
public String getDeliveryDate() {
return deliveryDate;
}
public void setDeliveryDate(String deliveryDate) {
this.deliveryDate = deliveryDate;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -978,6 +993,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -978,6 +993,7 @@ public class HPSC006 extends DaoEPBase {
setPartName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_NAME)), partName)); setPartName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_NAME)), partName));
setCutSchedule(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CUT_SCHEDULE)), cutSchedule)); setCutSchedule(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CUT_SCHEDULE)), cutSchedule));
setReqNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REQ_NUM)), reqNum)); setReqNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_REQ_NUM)), reqNum));
setDeliveryDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DELIVERY_DATE)), deliveryDate));
} }
/** /**
...@@ -1024,6 +1040,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -1024,6 +1040,7 @@ public class HPSC006 extends DaoEPBase {
map.put(FIELD_PART_NAME, StringUtils.toString(partName, eiMetadata.getMeta(FIELD_PART_NAME))); map.put(FIELD_PART_NAME, StringUtils.toString(partName, eiMetadata.getMeta(FIELD_PART_NAME)));
map.put(FIELD_CUT_SCHEDULE, StringUtils.toString(cutSchedule, eiMetadata.getMeta(FIELD_CUT_SCHEDULE))); map.put(FIELD_CUT_SCHEDULE, StringUtils.toString(cutSchedule, eiMetadata.getMeta(FIELD_CUT_SCHEDULE)));
map.put(FIELD_REQ_NUM, StringUtils.toString(reqNum, eiMetadata.getMeta(FIELD_REQ_NUM))); map.put(FIELD_REQ_NUM, StringUtils.toString(reqNum, eiMetadata.getMeta(FIELD_REQ_NUM)));
map.put(FIELD_DELIVERY_DATE, StringUtils.toString(deliveryDate, eiMetadata.getMeta(FIELD_DELIVERY_DATE)));
return map; return map;
} }
} }
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java
...@@ -6,11 +6,8 @@ import com.baosight.hpjx.core.constant.CommonConstant; ...@@ -6,11 +6,8 @@ import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.core.security.UserSessionUtils;
import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.pz.domain.HPPZ009; import com.baosight.hpjx.util.*;
import com.baosight.hpjx.util.AssertUtils; import com.baosight.hpjx.util.contants.ACConstants;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils;
import com.baosight.iplat4j.core.ei.EiBlock; import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
...@@ -55,6 +52,8 @@ public class ServiceHPSC001 extends ServiceBase { ...@@ -55,6 +52,8 @@ public class ServiceHPSC001 extends ServiceBase {
@OperationLogAnnotation(operModul = "销售管理",operType = "查询") @OperationLogAnnotation(operModul = "销售管理",operType = "查询")
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/ /* 调用EI查询方法.*/
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC001.FIELD_DELIVERY_DATE,
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC001.FIELD_DELIVERY_DATE)));
EiInfo outInfo = super.query(inInfo, "HPSC001.query", new HPSC001()); EiInfo outInfo = super.query(inInfo, "HPSC001.query", new HPSC001());
return outInfo; return outInfo;
...@@ -128,6 +127,7 @@ public class ServiceHPSC001 extends ServiceBase { ...@@ -128,6 +127,7 @@ public class ServiceHPSC001 extends ServiceBase {
*/ */
private void add(HPSC001 hpsc001) throws Exception { private void add(HPSC001 hpsc001) throws Exception {
hpsc001.setStatus(CommonConstant.YesNo.NO_0); hpsc001.setStatus(CommonConstant.YesNo.NO_0);
hpsc001.setDeliveryDate(DateUtils.formatShort(hpsc001.getDeliveryDate()));
hpsc001.setProjCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROJ_NUMBER)); hpsc001.setProjCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROJ_NUMBER));
DaoUtils.insert("HPSC001.insert", hpsc001); DaoUtils.insert("HPSC001.insert", hpsc001);
} }
...@@ -138,6 +138,7 @@ public class ServiceHPSC001 extends ServiceBase { ...@@ -138,6 +138,7 @@ public class ServiceHPSC001 extends ServiceBase {
* @param hpsc001 * @param hpsc001
*/ */
private void modify(HPSC001 hpsc001) { private void modify(HPSC001 hpsc001) {
hpsc001.setDeliveryDate(DateUtils.formatShort(hpsc001.getDeliveryDate()));
DaoUtils.update("HPSC001.update", hpsc001); DaoUtils.update("HPSC001.update", hpsc001);
} }
...@@ -152,6 +153,7 @@ public class ServiceHPSC001 extends ServiceBase { ...@@ -152,6 +153,7 @@ public class ServiceHPSC001 extends ServiceBase {
for (int i = 0; i < eiBlock.getRowCount(); i++) { for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i); Map<?, ?> map = eiBlock.getRow(i);
hpsc001.fromMap(map); hpsc001.fromMap(map);
hpsc001.setDeliveryDate(DateUtils.formatShort(hpsc001.getDeliveryDate()));
DaoUtils.update("HPSC001.update",hpsc001); DaoUtils.update("HPSC001.update",hpsc001);
} }
inInfo.setStatus(EiConstant.STATUS_SUCCESS); inInfo.setStatus(EiConstant.STATUS_SUCCESS);
...@@ -241,6 +243,7 @@ public class ServiceHPSC001 extends ServiceBase { ...@@ -241,6 +243,7 @@ public class ServiceHPSC001 extends ServiceBase {
hpsc002.put("projName", hpsc001.getProjName()); hpsc002.put("projName", hpsc001.getProjName());
hpsc002.put("parentId", "root"); //固定写死 hpsc002.put("parentId", "root"); //固定写死
hpsc002.put("parentPrdtName", hpsc001.getProjName()); hpsc002.put("parentPrdtName", hpsc001.getProjName());
hpsc002.put("deliveryDate",hpsc001.getDeliveryDate());
hpsc002.put("type", ""); hpsc002.put("type", "");
hpsc002.put("leaf", "0"); hpsc002.put("leaf", "0");
hpsc002.put("sort", ""); hpsc002.put("sort", "");
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
...@@ -750,6 +750,7 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -750,6 +750,7 @@ public class ServiceHPSC002 extends ServiceBase {
String parentId = (String) params.get("parentId"); String parentId = (String) params.get("parentId");
String projCode = (String) params.get("projCode"); String projCode = (String) params.get("projCode");
String projName = (String) params.get("projName"); String projName = (String) params.get("projName");
String deliveryDate = (String) params.get("deliveryDate");
String parentPrdtName = (String) params.get("parentPrdtName"); String parentPrdtName = (String) params.get("parentPrdtName");
// 写入数据 // 写入数据
for (HPSC002 hpsc002:dataList) { for (HPSC002 hpsc002:dataList) {
...@@ -757,6 +758,7 @@ public class ServiceHPSC002 extends ServiceBase { ...@@ -757,6 +758,7 @@ public class ServiceHPSC002 extends ServiceBase {
hpsc002.setProjCode(projCode); hpsc002.setProjCode(projCode);
hpsc002.setProjName(projName); hpsc002.setProjName(projName);
hpsc002.setParentPrdtName(parentPrdtName); hpsc002.setParentPrdtName(parentPrdtName);
hpsc002.setDeliveryDate(deliveryDate);
hpsc002.setStatus(CommonConstant.YesNo.NO_0.intValue()); hpsc002.setStatus(CommonConstant.YesNo.NO_0.intValue());
add(hpsc002); add(hpsc002);
} }
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java
...@@ -17,6 +17,7 @@ import com.baosight.hpjx.util.DateUtils; ...@@ -17,6 +17,7 @@ import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.EiInfoUtils; import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.StringUtils; import com.baosight.hpjx.util.StringUtils;
import com.baosight.hpjx.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiBlock; import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
...@@ -65,9 +66,10 @@ public class ServiceHPSC003 extends ServiceBase { ...@@ -65,9 +66,10 @@ public class ServiceHPSC003 extends ServiceBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
Map queryRow = EiInfoUtils.getFirstRow(inInfo); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_DELIVERY_DATE,
queryRow.put("planCompletionDate", DateUtils.formatShort(MapUtils.getString(queryRow, DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_DELIVERY_DATE)));
"planCompletionDate"))); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_PLAN_COMPLETION_DATE,
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_PLAN_COMPLETION_DATE)));
inInfo = super.query(inInfo, HPSC003.QUERY, new HPSC003()); inInfo = super.query(inInfo, HPSC003.QUERY, new HPSC003());
inInfo.addBlock(HPConstants.BLOCK_DETAIL).addBlockMeta(new HPSC004().eiMetadata); inInfo.addBlock(HPConstants.BLOCK_DETAIL).addBlockMeta(new HPSC004().eiMetadata);
} catch (Throwable e) { } catch (Throwable e) {
...@@ -153,7 +155,7 @@ public class ServiceHPSC003 extends ServiceBase { ...@@ -153,7 +155,7 @@ public class ServiceHPSC003 extends ServiceBase {
fSc004.fromMap(resultRow); fSc004.fromMap(resultRow);
parentId = fSc004.getParentId(); parentId = fSc004.getParentId();
// 更新计划明细完工时间 // 更新计划明细完工时间
fSc004.setPlanCommentDate(DateUtils.formatShort(fSc004.getPlanCommentDate())); fSc004.setPlanCommentDate(DateUtils.formatShort(fSc004.getPlanCompletionDate()));
fSc004.setPlanCompletionDate(DateUtils.formatShort(fSc004.getPlanCompletionDate())); fSc004.setPlanCompletionDate(DateUtils.formatShort(fSc004.getPlanCompletionDate()));
DaoUtils.update(HPSqlConstant.HPSC004.UPDATE_PLAN_DATE, fSc004); DaoUtils.update(HPSqlConstant.HPSC004.UPDATE_PLAN_DATE, fSc004);
} }
...@@ -243,6 +245,7 @@ public class ServiceHPSC003 extends ServiceBase { ...@@ -243,6 +245,7 @@ public class ServiceHPSC003 extends ServiceBase {
newSc005.setPartThick(dbSc004.getThick()); newSc005.setPartThick(dbSc004.getThick());
newSc005.setPartSpec(dbSc004.getSpec()); newSc005.setPartSpec(dbSc004.getSpec());
newSc005.setRemark1(dbSc004.getRemark()); newSc005.setRemark1(dbSc004.getRemark());
newSc005.setWorkDate(DateUtils.shortDate());
newSc005.setPlanCompletionDate(dbSc004.getPlanCompletionDate()); newSc005.setPlanCompletionDate(dbSc004.getPlanCompletionDate());
newSc005.setNum(dbSc004.getNum()); newSc005.setNum(dbSc004.getNum());
newSc005.setUnassignedNum(dbSc004.getNum()); newSc005.setUnassignedNum(dbSc004.getNum());
...@@ -251,6 +254,7 @@ public class ServiceHPSC003 extends ServiceBase { ...@@ -251,6 +254,7 @@ public class ServiceHPSC003 extends ServiceBase {
newSc005.setFilePath1(dbSc004.getFilePath1()); newSc005.setFilePath1(dbSc004.getFilePath1());
newSc005.setMatId(dbSc004.getMatId()); newSc005.setMatId(dbSc004.getMatId());
newSc005.setStatus(CommonConstant.YesNo.NO_0); newSc005.setStatus(CommonConstant.YesNo.NO_0);
newSc005.setDeliveryDate(dbSc003.getDeliveryDate());
newSc005.setDepCode(dbSc004.getDepCode()); newSc005.setDepCode(dbSc004.getDepCode());
DaoUtils.insert(HPSC005.INSERT, newSc005); DaoUtils.insert(HPSC005.INSERT, newSc005);
return newSc005; return newSc005;
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005.java
...@@ -2,11 +2,13 @@ package com.baosight.hpjx.hp.sc.service; ...@@ -2,11 +2,13 @@ package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.hp.sc.domain.HPSC003;
import com.baosight.hpjx.hp.sc.domain.HPSC005; import com.baosight.hpjx.hp.sc.domain.HPSC005;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.DateUtils; import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.EiInfoUtils; import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiConstant; 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.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
...@@ -48,9 +50,10 @@ public class ServiceHPSC005 extends ServiceBase { ...@@ -48,9 +50,10 @@ public class ServiceHPSC005 extends ServiceBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
Map queryRow = EiInfoUtils.getFirstRow(inInfo); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_DELIVERY_DATE,
queryRow.put("planCompletionDate", DateUtils.formatShort(MapUtils.getString(queryRow, DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_DELIVERY_DATE)));
"planCompletionDate"))); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_PLAN_COMPLETION_DATE,
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_PLAN_COMPLETION_DATE)));
inInfo = super.query(inInfo, HPSC005.QUERY, new HPSC005()); inInfo = super.query(inInfo, HPSC005.QUERY, new HPSC005());
} catch (Throwable e) { } catch (Throwable e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败"); LogUtils.setDetailMsg(inInfo, e, "查询失败");
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
...@@ -18,6 +18,7 @@ import com.baosight.hpjx.hp.sc.tools.HPSCTools; ...@@ -18,6 +18,7 @@ import com.baosight.hpjx.hp.sc.tools.HPSCTools;
import com.baosight.hpjx.hp.xs.domain.Org; import com.baosight.hpjx.hp.xs.domain.Org;
import com.baosight.hpjx.hp.xs.tools.HPXSTools; import com.baosight.hpjx.hp.xs.tools.HPXSTools;
import com.baosight.hpjx.util.*; import com.baosight.hpjx.util.*;
import com.baosight.hpjx.util.contants.ACConstants;
import com.baosight.iplat4j.core.ProjectInfo; import com.baosight.iplat4j.core.ProjectInfo;
import com.baosight.iplat4j.core.ei.EiBlock; import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
...@@ -68,8 +69,13 @@ public class ServiceHPSC006 extends ServiceBase { ...@@ -68,8 +69,13 @@ public class ServiceHPSC006 extends ServiceBase {
@OperationLogAnnotation(operModul = "生产下料",operType = "查询",operDesc = "查询") @OperationLogAnnotation(operModul = "生产下料",operType = "查询",operDesc = "查询")
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
HPSC005 HPSC005 = new HPSC005();
/* 调用EI查询方法.*/ /* 调用EI查询方法.*/
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_DELIVERY_DATE,
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC003.FIELD_DELIVERY_DATE)));
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC005.FIELD_WORK_DATE,
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC005.FIELD_WORK_DATE)));
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC005.FIELD_PLAN_COMPLETION_DATE,
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC005.FIELD_PLAN_COMPLETION_DATE)));
EiInfo outInfo = super.query(inInfo, "HPSC005.query", new HPSC005()); EiInfo outInfo = super.query(inInfo, "HPSC005.query", new HPSC005());
EiBlock blcok = outInfo.addBlock(HPConstants.BLOCK_DETAIL); EiBlock blcok = outInfo.addBlock(HPConstants.BLOCK_DETAIL);
blcok.setBlockMeta(new HPSC006().eiMetadata); blcok.setBlockMeta(new HPSC006().eiMetadata);
...@@ -120,6 +126,7 @@ public class ServiceHPSC006 extends ServiceBase { ...@@ -120,6 +126,7 @@ public class ServiceHPSC006 extends ServiceBase {
String productionOrderNo = inInfo.getString("productionOrderNo"); String productionOrderNo = inInfo.getString("productionOrderNo");
String projCode = inInfo.getString("projCode"); String projCode = inInfo.getString("projCode");
String projName = inInfo.getString("projName"); String projName = inInfo.getString("projName");
String deliveryDate = inInfo.getString("deliveryDate");
// 写入数据 // 写入数据
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HPSC006 hpsc006 = new HPSC006(); HPSC006 hpsc006 = new HPSC006();
...@@ -132,6 +139,7 @@ public class ServiceHPSC006 extends ServiceBase { ...@@ -132,6 +139,7 @@ public class ServiceHPSC006 extends ServiceBase {
hpsc006.setInventSpec(HPPZTools.HpPz006.jointSpec(hpsc006.getInventLength(),hpsc006.getInventWidth(),hpsc006.getInventThick())); hpsc006.setInventSpec(HPPZTools.HpPz006.jointSpec(hpsc006.getInventLength(),hpsc006.getInventWidth(),hpsc006.getInventThick()));
hpsc006.setProjCode(projCode); hpsc006.setProjCode(projCode);
hpsc006.setProjName(projName); hpsc006.setProjName(projName);
hpsc006.setDeliveryDate(deliveryDate);
hpsc006.setProductionOrderNo(productionOrderNo); hpsc006.setProductionOrderNo(productionOrderNo);
hpsc006.setTotalWt(totalWt); hpsc006.setTotalWt(totalWt);
hpsc006.setInventCode(HPPZTools.checkAndSavePZ04(hpsc006.getInventType(),hpsc006.getInventName())); hpsc006.setInventCode(HPPZTools.checkAndSavePZ04(hpsc006.getInventType(),hpsc006.getInventName()));
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC011.java
...@@ -5,7 +5,9 @@ import com.baosight.hpjx.common.DdynamicEnum; ...@@ -5,7 +5,9 @@ import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.security.UserSessionUtils; import com.baosight.hpjx.core.security.UserSessionUtils;
import com.baosight.hpjx.hp.sc.domain.HPSC001; import com.baosight.hpjx.hp.sc.domain.HPSC001;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiConstant; 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;
...@@ -46,6 +48,8 @@ public class ServiceHPSC011 extends ServiceBase { ...@@ -46,6 +48,8 @@ public class ServiceHPSC011 extends ServiceBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/ /* 调用EI查询方法.*/
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC001.FIELD_DELIVERY_DATE,
DateUtils.formatShort(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC001.FIELD_DELIVERY_DATE)));
inInfo.setCell(EiConstant.queryBlock, 0, "status", 1); inInfo.setCell(EiConstant.queryBlock, 0, "status", 1);
EiInfo outInfo = super.query(inInfo, "HPSC001.query", new HPSC001()); EiInfo outInfo = super.query(inInfo, "HPSC001.query", new HPSC001());
return outInfo; return outInfo;
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PRINC1 as "princ1", <!-- 本公司项目负责人 --> PRINC1 as "princ1", <!-- 本公司项目负责人 -->
PRINC2 as "princ2", <!-- 客户项目负责人 --> PRINC2 as "princ2", <!-- 客户项目负责人 -->
DELIVERY_DATE as "deliveryDate",
STATUS as "status", <!-- 状态 0-未提交，1-已提交 --> STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
...@@ -49,6 +50,9 @@ ...@@ -49,6 +50,9 @@
<isNotEmpty prepend=" AND " property="projCode"> <isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE LIKE ('%$projCode$%') PROJ_CODE LIKE ('%$projCode$%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="status"> <isNotEmpty prepend=" AND " property="status">
STATUS = #status# STATUS = #status#
</isNotEmpty> </isNotEmpty>
...@@ -91,6 +95,9 @@ ...@@ -91,6 +95,9 @@
<isNotEmpty prepend=" AND " property="projCode"> <isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE LIKE ('%$projCode$%') PROJ_CODE LIKE ('%$projCode$%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="status"> <isNotEmpty prepend=" AND " property="status">
STATUS = #status# STATUS = #status#
</isNotEmpty> </isNotEmpty>
...@@ -152,6 +159,7 @@ ...@@ -152,6 +159,7 @@
PROJ_NAME, <!-- 项目名称 --> PROJ_NAME, <!-- 项目名称 -->
PRINC1, <!-- 本公司项目负责人 --> PRINC1, <!-- 本公司项目负责人 -->
PRINC2, <!-- 客户项目负责人 --> PRINC2, <!-- 客户项目负责人 -->
DELIVERY_DATE,
STATUS, <!-- 状态 0-未提交，1-已提交 --> STATUS, <!-- 状态 0-未提交，1-已提交 -->
MATERIAL_STATUS, MATERIAL_STATUS,
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
...@@ -161,7 +169,7 @@ ...@@ -161,7 +169,7 @@
DEP_CODE, <!-- 部门编码 --> DEP_CODE, <!-- 部门编码 -->
REMARK REMARK
) )
VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #princ1#, #princ2#, #status#, 0, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#) VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #princ1#, #princ2#, #deliveryDate#, #status#, 0, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -178,6 +186,7 @@ ...@@ -178,6 +186,7 @@
PROJ_NAME = #projName#, <!-- 项目名称 --> PROJ_NAME = #projName#, <!-- 项目名称 -->
PRINC1 = #princ1#, <!-- 本公司项目负责人 --> PRINC1 = #princ1#, <!-- 本公司项目负责人 -->
PRINC2 = #princ2#, <!-- 客户项目负责人 --> PRINC2 = #princ2#, <!-- 客户项目负责人 -->
DELIVERY_DATE = #deliveryDate#,
STATUS = #status#, <!-- 状态 0-未提交，1-已提交 --> STATUS = #status#, <!-- 状态 0-未提交，1-已提交 -->
MATERIAL_STATUS = #materialStatus#, MATERIAL_STATUS = #materialStatus#,
CREATED_BY = #createdBy#, <!-- 创建人 --> CREATED_BY = #createdBy#, <!-- 创建人 -->
...@@ -215,6 +224,7 @@ ...@@ -215,6 +224,7 @@
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PRINC1 as "princ1", <!-- 本公司项目负责人 --> PRINC1 as "princ1", <!-- 本公司项目负责人 -->
PRINC2 as "princ2", <!-- 客户项目负责人 --> PRINC2 as "princ2", <!-- 客户项目负责人 -->
DELIVERY_DATE as "deliveryDate",
STATUS as "status", <!-- 状态 0-未提交，1-已提交 --> STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
...@@ -250,7 +260,8 @@ ...@@ -250,7 +260,8 @@
PROJ_CODE as "projCode", <!-- 项目编码 --> PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 --> PROJ_NAME as "projName", <!-- 项目名称 -->
PRINC1 as "princ1", <!-- 本公司项目负责人 --> PRINC1 as "princ1", <!-- 本公司项目负责人 -->
PRINC2 as "princ2", <!-- 客户项目负责人 --> PRINC2 as "princ2",<!-- 客户项目负责人 -->
DELIVERY_DATE as "deliveryDate",
STATUS as "status", <!-- 状态 0-未提交，1-已提交 --> STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY as "createdBy", <!-- 创建人 --> CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
...@@ -264,4 +275,28 @@ ...@@ -264,4 +275,28 @@
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
</select> </select>
<select id="queryDomainById" parameterClass="java.util.HashMap"
resultClass="com.baosight.hpjx.hp.sc.domain.HPSC001">
SELECT
ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
PROJ_TYPE as "projType", <!-- 项目类型 -->
PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 -->
PRINC1 as "princ1", <!-- 本公司项目负责人 -->
PRINC2 as "princ2", <!-- 客户项目负责人 -->
DELIVERY_DATE as "deliveryDate",
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
DEP_CODE as "depCode", <!-- 部门编码 -->
REMARK as "remark" <!-- 备注 -->
FROM hpjx.t_hpsc001 WHERE 1=1
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
</select>
</sqlMap> </sqlMap>
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
SPEC as "spec", SPEC as "spec",
LENGTH as "length", <!-- 长 --> LENGTH as "length", <!-- 长 -->
WIDTH as "width", <!-- 宽 --> WIDTH as "width", <!-- 宽 -->
THICK as "thick" <!-- 厚 --> THICK as "thick", <!-- 厚 -->
DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="column1"> <sql id="column1">
...@@ -76,7 +77,8 @@ ...@@ -76,7 +77,8 @@
A.LENGTH as "length", <!-- 长 --> A.LENGTH as "length", <!-- 长 -->
A.WIDTH as "width", <!-- 宽 --> A.WIDTH as "width", <!-- 宽 -->
A.THICK as "thick", <!-- 厚 --> A.THICK as "thick", <!-- 厚 -->
B.STATUS as "pgStatus" <!-- 派工状态 --> B.STATUS as "pgStatus", <!-- 派工状态 -->
A.DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -108,6 +110,9 @@ ...@@ -108,6 +110,9 @@
<isNotEmpty prepend=" AND " property="lv"> <isNotEmpty prepend=" AND " property="lv">
LV = #lv# LV = #lv#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<sql id="authCondition"> <sql id="authCondition">
...@@ -154,6 +159,12 @@ ...@@ -154,6 +159,12 @@
<isNotEmpty prepend=" AND " property="projCode"> <isNotEmpty prepend=" AND " property="projCode">
A.PROJ_CODE = #projCode# A.PROJ_CODE = #projCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
A.COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
A.DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<sql id="authCondition1"> <sql id="authCondition1">
...@@ -233,13 +244,13 @@ ...@@ -233,13 +244,13 @@
SPEC, SPEC,
LENGTH, <!-- 长 --> LENGTH, <!-- 长 -->
WIDTH, <!-- 宽 --> WIDTH, <!-- 宽 -->
THICK <!-- 厚 --> THICK, <!-- 厚 -->
) DELIVERY_DATE )
VALUES (#id#, #companyCode#, #depCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#, VALUES (#id#, #companyCode#, #depCode#, #projCode#, #projName#, #parentId#, #parentPrdtName#,
#type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#, #prdtName#, #inventRecordId#, #num#, #type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#, #prdtName#, #inventRecordId#, #num#,
#unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #status#, #unitWt#, #totalWt#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #status#,
#delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#, #lv#, #spec#, #delStatus#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #remark#, #lv#, #spec#,
#length#, #width#, #thick#) #length#, #width#, #thick#, #deliveryDate#)
</insert> </insert>
<!-- 删除 --> <!-- 删除 -->
...@@ -288,7 +299,8 @@ ...@@ -288,7 +299,8 @@
SPEC = #spec#, <!-- 规格 --> SPEC = #spec#, <!-- 规格 -->
LENGTH = #length#, <!-- 长 --> LENGTH = #length#, <!-- 长 -->
WIDTH = #width#, <!-- 宽 --> WIDTH = #width#, <!-- 宽 -->
THICK = #thick# <!-- 厚 --> THICK = #thick#, <!-- 厚 -->
DELIVERY_DATE = #deliveryDate#
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
...@@ -311,7 +323,8 @@ ...@@ -311,7 +323,8 @@
SORT as "sort", <!-- 排序字段 --> SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 --> ICON as "icon", <!-- 图片地址 -->
LV as "lv", LV as "lv",
SPEC as "spec" SPEC as "spec",
DELIVERY_DATE as "deliveryDate"
FROM FROM
hpjx.t_hpsc002 hpjx.t_hpsc002
WHERE WHERE
...@@ -344,7 +357,8 @@ ...@@ -344,7 +357,8 @@
SORT as "sort", <!-- 排序字段 --> SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 --> ICON as "icon", <!-- 图片地址 -->
LV as "lv", LV as "lv",
SPEC as "spec" SPEC as "spec",
DELIVERY_DATE as "deliveryDate"
FROM FROM
hpjx.t_hpsc002 hpjx.t_hpsc002
WHERE WHERE
...@@ -378,7 +392,8 @@ ...@@ -378,7 +392,8 @@
SORT as "sort", <!-- 排序字段 --> SORT as "sort", <!-- 排序字段 -->
ICON as "icon", <!-- 图片地址 --> ICON as "icon", <!-- 图片地址 -->
LV as "lv", LV as "lv",
SPEC as "spec" SPEC as "spec",
DELIVERY_DATE as "deliveryDate"
FROM FROM
hpjx.t_hpsc002 hpjx.t_hpsc002
WHERE WHERE
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
<isNotEmpty prepend=" AND " property="matId"> <isNotEmpty prepend=" AND " property="matId">
MAT_ID = #matId# MAT_ID = #matId#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<sql id="authCondition"> <sql id="authCondition">
...@@ -101,6 +104,7 @@ ...@@ -101,6 +104,7 @@
WIDTH as "width", <!-- 宽 --> WIDTH as "width", <!-- 宽 -->
THICK as "thick", <!-- 厚 --> THICK as "thick", <!-- 厚 -->
MAT_ID AS "matId", MAT_ID AS "matId",
DELIVERY_DATE as "deliveryDate",
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)
...@@ -150,12 +154,13 @@ ...@@ -150,12 +154,13 @@
UPDATED_TIME, <!-- 更新时间 --> UPDATED_TIME, <!-- 更新时间 -->
DEP_CODE, <!-- 部门编码 --> DEP_CODE, <!-- 部门编码 -->
REMARK, <!-- 备注 --> REMARK, <!-- 备注 -->
MAT_ID MAT_ID,
DELIVERY_DATE
) )
VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#,#inventRecordId#, VALUES (#id#, #companyCode#, #projType#, #projCode#, #projName#, #planInfoNo#,#inventRecordId#,
#spec#, #length#, #width#, #thick#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #status#, #spec#, #length#, #width#, #thick#, #prdtType#, #prdtCode#, #prdtName#, #planCompletionDate#, #status#,
#createdBy#, #createdBy#,
#createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#,#matId#) #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#,#matId#, #deliveryDate#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -189,7 +194,8 @@ ...@@ -189,7 +194,8 @@
UPDATED_BY = #updatedBy#, <!-- 更新人 --> UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 --> UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
DEP_CODE = #depCode#, <!-- 部门编码 --> DEP_CODE = #depCode#, <!-- 部门编码 -->
REMARK = #remark# <!-- 备注 --> REMARK = #remark#, <!-- 备注 -->
DELIVERY_DATE = #deliveryDate#
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
UPDATED_BY as "updatedBy", <!-- 更新人 --> UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 修改人名称 --> UPDATED_NAME as "updatedName", <!-- 修改人名称 -->
UPDATED_TIME as "updatedTime", <!-- 更新时间 --> UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
DEL_STATUS as "delStatus" <!-- 状态:0未删除，1已删除 --> DEL_STATUS as "delStatus", <!-- 状态:0未删除，1已删除 -->
DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -173,6 +174,9 @@ ...@@ -173,6 +174,9 @@
<isNotEmpty prepend=" AND " property="delStatus"> <isNotEmpty prepend=" AND " property="delStatus">
DEL_STATUS = #delStatus# DEL_STATUS = #delStatus#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<sql id="authCondition"> <sql id="authCondition">
...@@ -259,14 +263,15 @@ ...@@ -259,14 +263,15 @@
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 --> CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME, <!-- 创建时间 --> CREATED_TIME, <!-- 创建时间 -->
DEL_STATUS <!-- 状态:0未删除，1已删除 --> DEL_STATUS, <!-- 状态:0未删除，1已删除 -->
DELIVERY_DATE
) VALUES ( ) VALUES (
#companyCode#, #depCode#, #projCode#, #projName#, #matId#, #parentId#, #parentPrdtName#, #companyCode#, #depCode#, #projCode#, #projName#, #matId#, #parentId#, #parentPrdtName#,
#prodOrderNo#, #type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#, #prodOrderNo#, #type#, #leaf#, #sort#, #icon#, #prdtType#, #prdtCode#,
#prdtName#, #length#, #width#, #thick#, #spec#, #num#, #unitWt#, #totalWt#, #filePath1#, #prdtName#, #length#, #width#, #thick#, #spec#, #num#, #unitWt#, #totalWt#, #filePath1#,
#filePath2#, #filePath3#, #filePath4#, #filePath5#, #planCommentDate#, #planCompletionDate#, #filePath2#, #filePath3#, #filePath4#, #filePath5#, #planCommentDate#, #planCompletionDate#,
#actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #inventRecordId#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #inventRecordId#,
#status#, #remark#, #createdBy#, #createdName#, #createdTime#, #delStatus# #status#, #remark#, #createdBy#, #createdName#, #createdTime#, #delStatus#, #deliveryDate#
) )
</insert> </insert>
...@@ -315,7 +320,8 @@ ...@@ -315,7 +320,8 @@
SPEC = #spec#, <!-- 规格 --> SPEC = #spec#, <!-- 规格 -->
LENGTH = #length#, <!-- 长 --> LENGTH = #length#, <!-- 长 -->
WIDTH = #width#, <!-- 宽 --> WIDTH = #width#, <!-- 宽 -->
THICK = #thick# <!-- 厚 --> THICK = #thick#, <!-- 厚 -->
DELIVERY_DATE = #deliveryDate#
WHERE ID = #id# WHERE ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005.xml
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
PART_WIDTH as "partWidth", <!-- 零件-宽 --> PART_WIDTH as "partWidth", <!-- 零件-宽 -->
PART_THICK as "partThick", <!-- 零件-厚 --> PART_THICK as "partThick", <!-- 零件-厚 -->
PART_SPEC as "partSpec", <!-- 零件规格 --> PART_SPEC as "partSpec", <!-- 零件规格 -->
WORK_DATE as "workDate",
PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 --> PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 -->
NUM as "num", <!-- 计划数量 --> NUM as "num", <!-- 计划数量 -->
UNIT_WT as "unitWt", <!-- 计划单重 --> UNIT_WT as "unitWt", <!-- 计划单重 -->
...@@ -49,7 +50,8 @@ ...@@ -49,7 +50,8 @@
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 -->
INVENT_RECORD_ID as "inventRecordId" <!-- 存货档案ID --> INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案ID -->
DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -78,6 +80,9 @@ ...@@ -78,6 +80,9 @@
<isNotEmpty prepend=" AND " property="prdtName"> <isNotEmpty prepend=" AND " property="prdtName">
PRDT_NAME LIKE CONCAT('%', #prdtName#, '%') PRDT_NAME LIKE CONCAT('%', #prdtName#, '%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="workDate">
WORK_DATE = #workDate#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planCompletionDate"> <isNotEmpty prepend=" AND " property="planCompletionDate">
PLAN_COMPLETION_DATE = #planCompletionDate# PLAN_COMPLETION_DATE = #planCompletionDate#
</isNotEmpty> </isNotEmpty>
...@@ -111,6 +116,9 @@ ...@@ -111,6 +116,9 @@
<isNotEmpty prepend=" AND " property="filePath1"> <isNotEmpty prepend=" AND " property="filePath1">
FILE_PATH1 = #filePath1# FILE_PATH1 = #filePath1#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="matId"> <isNotEmpty prepend=" AND " property="matId">
MAT_ID = #matId# MAT_ID = #matId#
...@@ -186,6 +194,7 @@ ...@@ -186,6 +194,7 @@
PART_WIDTH, <!-- 零件-宽 --> PART_WIDTH, <!-- 零件-宽 -->
PART_THICK, <!-- 零件-厚 --> PART_THICK, <!-- 零件-厚 -->
PART_SPEC, <!-- 零件规格 --> PART_SPEC, <!-- 零件规格 -->
WORK_DATE,
PLAN_COMPLETION_DATE, <!-- 计划完成日期 --> PLAN_COMPLETION_DATE, <!-- 计划完成日期 -->
NUM, <!-- 计划数量 --> NUM, <!-- 计划数量 -->
UNIT_WT, <!-- 计划单重 --> UNIT_WT, <!-- 计划单重 -->
...@@ -209,16 +218,17 @@ ...@@ -209,16 +218,17 @@
FILE_PATH4, <!-- 文件地址4 --> FILE_PATH4, <!-- 文件地址4 -->
FILE_PATH5, <!-- 文件地址5 --> FILE_PATH5, <!-- 文件地址5 -->
INVENT_RECORD_ID, <!-- 存货档案ID --> INVENT_RECORD_ID, <!-- 存货档案ID -->
MAT_ID <!-- 材料ID --> MAT_ID, <!-- 材料ID -->
DELIVERY_DATE
) VALUES ( ) VALUES (
#companyCode#, #depCode#, #prodOrderNo#, #projCode#, #companyCode#, #depCode#, #prodOrderNo#, #projCode#,
#projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #projName#, #prdtType#, #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#,
#prdtThick#, #prdtSpec#, #partType#, #partCode#, #partName#, #partLength#, #prdtThick#, #prdtSpec#, #partType#, #partCode#, #partName#, #partLength#,
#partWidth#, #partThick#, #partSpec#, #planCompletionDate#, #num#, #unitWt#, #partWidth#, #partThick#, #partSpec#, #workDate#, #planCompletionDate#, #num#, #unitWt#,
#totalWt#, #assignedNum#, #unassignedNum#, #status#, #factoryCode#, #factoryName#, #totalWt#, #assignedNum#, #unassignedNum#, #status#, #factoryCode#, #factoryName#,
#orgNo#, #orgName#, #documentType#, #remark#, #remark1#, #createdBy#, #createdName#, #orgNo#, #orgName#, #documentType#, #remark#, #remark1#, #createdBy#, #createdName#,
#createdTime#, #filePath1#, #filePath2#, #createdTime#, #filePath1#, #filePath2#,
#filePath3#, #filePath4#, #filePath5#, #inventRecordId#, #matId#) #filePath3#, #filePath4#, #filePath5#, #inventRecordId#, #matId#,#deliveryDate#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -248,6 +258,7 @@ ...@@ -248,6 +258,7 @@
PART_WIDTH = #partWidth#, <!-- 零件-宽 --> PART_WIDTH = #partWidth#, <!-- 零件-宽 -->
PART_THICK = #partThick#, <!-- 零件-厚 --> PART_THICK = #partThick#, <!-- 零件-厚 -->
PART_SPEC = #partSpec#, <!-- 零件规格 --> PART_SPEC = #partSpec#, <!-- 零件规格 -->
WORK_DATE = #workDate#,
PLAN_COMPLETION_DATE = #planCompletionDate#, <!-- 计划完成日期 --> PLAN_COMPLETION_DATE = #planCompletionDate#, <!-- 计划完成日期 -->
NUM = #num#, <!-- 计划数量 --> NUM = #num#, <!-- 计划数量 -->
UNIT_WT = #unitWt#, <!-- 计划单重 --> UNIT_WT = #unitWt#, <!-- 计划单重 -->
...@@ -270,7 +281,8 @@ ...@@ -270,7 +281,8 @@
FILE_PATH3 = #filePath3#, <!-- 文件地址3 --> FILE_PATH3 = #filePath3#, <!-- 文件地址3 -->
FILE_PATH4 = #filePath4#, <!-- 文件地址4 --> FILE_PATH4 = #filePath4#, <!-- 文件地址4 -->
FILE_PATH5 = #filePath5#, <!-- 文件地址5 --> FILE_PATH5 = #filePath5#, <!-- 文件地址5 -->
INVENT_RECORD_ID = #inventRecordId# <!-- 存货档案ID --> INVENT_RECORD_ID = #inventRecordId#, <!-- 存货档案ID -->
DELIVERY_DATE = #deliveryDate#
WHERE ID = #id# WHERE ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005B.xml
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
A.PART_THICK as "partThick", <!-- 厚 --> A.PART_THICK as "partThick", <!-- 厚 -->
A.UNIT_WT as "unitWt", <!-- 单重 --> A.UNIT_WT as "unitWt", <!-- 单重 -->
A.STATUS as "status", <!-- 状态 --> A.STATUS as "status", <!-- 状态 -->
A.WORK_DATE as "workDate",
A.PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 --> A.PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 -->
A.FILE_PATH1 as "filePath1", A.FILE_PATH1 as "filePath1",
A.CREATED_TIME as "createdTime", <!-- 创建时间 --> A.CREATED_TIME as "createdTime", <!-- 创建时间 -->
...@@ -35,7 +36,8 @@ ...@@ -35,7 +36,8 @@
B.FACTORY_NAME as "factoryName", <!-- 工厂 --> B.FACTORY_NAME as "factoryName", <!-- 工厂 -->
B.ORG_NO as "orgNo", B.ORG_NO as "orgNo",
B.ORG_NAME as "orgName", B.ORG_NAME as "orgName",
C.PROD_TASK_NO as "zlprodTaskNo" C.PROD_TASK_NO as "zlprodTaskNo",
A.DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="authCondition"> <sql id="authCondition">
...@@ -97,6 +99,9 @@ ...@@ -97,6 +99,9 @@
<isNotEmpty prepend=" AND " property="orgName"> <isNotEmpty prepend=" AND " property="orgName">
B.ORG_NAME LIKE CONCAT('%', #orgName#, '%') B.ORG_NAME LIKE CONCAT('%', #orgName#, '%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
A.DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<sql id="customCondition"> <sql id="customCondition">
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005C.xml
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
PRDT_TYPE as "prdtType", PRDT_TYPE as "prdtType",
PRDT_CODE as "prdtCode", <!-- 部件编码 --> PRDT_CODE as "prdtCode", <!-- 部件编码 -->
PRDT_NAME as "prdtName", <!-- 部件名称 --> PRDT_NAME as "prdtName", <!-- 部件名称 -->
WORK_DATE as "workDate",
PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 --> PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 -->
NUM as "num", <!-- 计划数量 --> NUM as "num", <!-- 计划数量 -->
UNIT_WT as "unitWt", <!-- 单重 --> UNIT_WT as "unitWt", <!-- 单重 -->
...@@ -45,7 +46,8 @@ ...@@ -45,7 +46,8 @@
FACTORY_NAME as "factoryName", <!-- 工厂 --> FACTORY_NAME as "factoryName", <!-- 工厂 -->
ASSIGNED_NUM as "assignedNum", <!-- 已派工数量 --> ASSIGNED_NUM as "assignedNum", <!-- 已派工数量 -->
UNASSIGNED_NUM as "unassignedNum", <!-- 待派工数量 --> UNASSIGNED_NUM as "unassignedNum", <!-- 待派工数量 -->
DOCUMENT_TYPE as "documentType" <!-- 单据类型 0-非子母单；1-子母单 --> DOCUMENT_TYPE as "documentType", <!-- 单据类型 0-非子母单；1-子母单 -->
DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="column2"> <sql id="column2">
A.ID as "id", A.ID as "id",
...@@ -57,6 +59,7 @@ ...@@ -57,6 +59,7 @@
A.PRDT_TYPE as "prdtType", A.PRDT_TYPE as "prdtType",
A.PRDT_CODE as "prdtCode", <!-- 部件编码 --> A.PRDT_CODE as "prdtCode", <!-- 部件编码 -->
A.PRDT_NAME as "prdtName", <!-- 部件名称 --> A.PRDT_NAME as "prdtName", <!-- 部件名称 -->
A.WORK_DATE as "workDate",
A.PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 --> A.PLAN_COMPLETION_DATE as "planCompletionDate", <!-- 计划完成日期 -->
A.NUM as "num", <!-- 计划数量 --> A.NUM as "num", <!-- 计划数量 -->
A.UNIT_WT as "unitWt", <!-- 单重 --> A.UNIT_WT as "unitWt", <!-- 单重 -->
...@@ -95,7 +98,8 @@ ...@@ -95,7 +98,8 @@
B.COMPLETE_NUM as "completeNum", <!-- 已完成数量 --> B.COMPLETE_NUM as "completeNum", <!-- 已完成数量 -->
COALESCE(A.TOTAL_WT*A.UNASSIGNED_NUM,0) as "unTotalWt", <!-- 剩余重量 --> COALESCE(A.TOTAL_WT*A.UNASSIGNED_NUM,0) as "unTotalWt", <!-- 剩余重量 -->
COALESCE(C.ACTUAL_COMPLETION_DATE,"") as "actualCompletionDate", <!-- 实际完工日期 --> COALESCE(C.ACTUAL_COMPLETION_DATE,"") as "actualCompletionDate", <!-- 实际完工日期 -->
COALESCE(C.ACTUAL_COMPLETION_NUM,0) as "actualCompletionTotalWt"<!-- 实际完工重量 --> COALESCE(C.ACTUAL_COMPLETION_NUM,0) as "actualCompletionTotalWt",<!-- 实际完工重量 -->
A.DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="authCondition"> <sql id="authCondition">
...@@ -139,6 +143,9 @@ ...@@ -139,6 +143,9 @@
<isNotEmpty prepend=" AND " property="prdtName"> <isNotEmpty prepend=" AND " property="prdtName">
PRDT_NAME LIKE CONCAT('%', #prdtName#, '%') PRDT_NAME LIKE CONCAT('%', #prdtName#, '%')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="workDate">
WORK_DATE = #workDate#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planCompletionDate"> <isNotEmpty prepend=" AND " property="planCompletionDate">
PLAN_COMPLETION_DATE = #planCompletionDate# PLAN_COMPLETION_DATE = #planCompletionDate#
</isNotEmpty> </isNotEmpty>
...@@ -190,6 +197,9 @@ ...@@ -190,6 +197,9 @@
<isNotEmpty prepend=" AND " property="filePath5"> <isNotEmpty prepend=" AND " property="filePath5">
FILE_PATH5 = #filePath5# FILE_PATH5 = #filePath5#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<!-- 公共修改字段 --> <!-- 公共修改字段 -->
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC006.xml
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
DEP_CODE as "depCode", <!-- 部门编码 --> DEP_CODE as "depCode", <!-- 部门编码 -->
REMARK as "remark", <!-- 备注 --> REMARK as "remark", <!-- 备注 -->
FILE_PATH1 as "filePath1", <!-- 文件地址1 --> FILE_PATH1 as "filePath1", <!-- 文件地址1 -->
INVENT_RECORD_ID as "inventRecordId" <!-- 存货档案ID --> INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案ID -->
DELIVERY_DATE as "deliveryDate"
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -133,6 +134,9 @@ ...@@ -133,6 +134,9 @@
<isNotEmpty prepend=" AND " property="inventRecordId"> <isNotEmpty prepend=" AND " property="inventRecordId">
INVENT_RECORD_ID = #inventRecordId# INVENT_RECORD_ID = #inventRecordId#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<sql id="authCondition"> <sql id="authCondition">
...@@ -214,13 +218,14 @@ ...@@ -214,13 +218,14 @@
DEP_CODE, <!-- 部门编码 --> DEP_CODE, <!-- 部门编码 -->
REMARK, <!-- 备注 --> REMARK, <!-- 备注 -->
FILE_PATH1, <!-- 文件地址1 --> FILE_PATH1, <!-- 文件地址1 -->
INVENT_RECORD_ID <!-- 存货档案ID --> INVENT_RECORD_ID, <!-- 存货档案ID -->
DELIVERY_DATE
) )
VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#, VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#,
#inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #material#, #planCompletionDate#, #inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #material#, #planCompletionDate#,
#num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionTotalWt#,#status#, #orgNo#, #num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionTotalWt#,#status#, #orgNo#,
#orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#,
#depCode#, #remark#, #filePath1#, #inventRecordId#) #depCode#, #remark#, #filePath1#, #inventRecordId#, #deliveryDate#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -262,7 +267,8 @@ ...@@ -262,7 +267,8 @@
DEP_CODE = #depCode#, <!-- 部门编码 --> DEP_CODE = #depCode#, <!-- 部门编码 -->
REMARK = #remark#, <!-- 备注 --> REMARK = #remark#, <!-- 备注 -->
FILE_PATH1 = #filePath1#, <!-- 文件地址1 --> FILE_PATH1 = #filePath1#, <!-- 文件地址1 -->
INVENT_RECORD_ID = #inventRecordId# <!-- 存货档案ID --> INVENT_RECORD_ID = #inventRecordId#, <!-- 存货档案ID -->
DELIVERY_DATE = #deliveryDate#
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC006A.xml
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
REMARK as "remark", <!-- 备注 --> REMARK as "remark", <!-- 备注 -->
FILE_PATH1 as "filePath1", <!-- 文件地址1 --> FILE_PATH1 as "filePath1", <!-- 文件地址1 -->
INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案ID --> INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案ID -->
DELIVERY_DATE as "deliveryDate",
TOTAL_WT/ACTUAL_COMPLETION_NUM TOTAL_WT/ACTUAL_COMPLETION_NUM
CONCAT( CONCAT(
format((ifnull( TOTAL_WT, 0 ) / ifnull(ACTUAL_COMPLETION_NUM, 0 ) * 100),2) format((ifnull( TOTAL_WT, 0 ) / ifnull(ACTUAL_COMPLETION_NUM, 0 ) * 100),2)
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
A.REMARK as "remark", <!-- 备注 --> A.REMARK as "remark", <!-- 备注 -->
A.FILE_PATH1 as "filePath1", <!-- 文件地址1 --> A.FILE_PATH1 as "filePath1", <!-- 文件地址1 -->
A.INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案ID --> A.INVENT_RECORD_ID as "inventRecordId", <!-- 存货档案ID -->
A.DELIVERY_DATE as "deliveryDate",
CONCAT( CONCAT(
format((ifnull( A.ACTUAL_COMPLETION_TOTAL_WT , 0 ) / ifnull(A.TOTAL_WT, 0 ) * 100),2) format((ifnull( A.ACTUAL_COMPLETION_TOTAL_WT , 0 ) / ifnull(A.TOTAL_WT, 0 ) * 100),2)
,'%') AS "cutSchedule", ,'%') AS "cutSchedule",
...@@ -227,6 +229,9 @@ ...@@ -227,6 +229,9 @@
<isNotEmpty prepend=" AND " property="inventRecordId"> <isNotEmpty prepend=" AND " property="inventRecordId">
A.INVENT_RECORD_ID = #inventRecordId# A.INVENT_RECORD_ID = #inventRecordId#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="deliveryDate">
A.DELIVERY_DATE = #deliveryDate#
</isNotEmpty>
</sql> </sql>
<sql id="order"> <sql id="order">
...@@ -290,13 +295,14 @@ ...@@ -290,13 +295,14 @@
DEP_CODE, <!-- 部门编码 --> DEP_CODE, <!-- 部门编码 -->
REMARK, <!-- 备注 --> REMARK, <!-- 备注 -->
FILE_PATH1, <!-- 文件地址1 --> FILE_PATH1, <!-- 文件地址1 -->
INVENT_RECORD_ID <!-- 存货档案ID --> INVENT_RECORD_ID, <!-- 存货档案ID -->
DELIVERY_DATE
) )
VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#, VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#,
#inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #material#, #planCompletionDate#, #inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #material#, #planCompletionDate#,
#num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionTotalWt#,#status#, #orgNo#, #num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionTotalWt#,#status#, #orgNo#,
#orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#,
#depCode#, #remark#, #filePath1#, #inventRecordId#) #depCode#, #remark#, #filePath1#, #inventRecordId#, #deliveryDate#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -338,7 +344,8 @@ ...@@ -338,7 +344,8 @@
DEP_CODE = #depCode#, <!-- 部门编码 --> DEP_CODE = #depCode#, <!-- 部门编码 -->
REMARK = #remark#, <!-- 备注 --> REMARK = #remark#, <!-- 备注 -->
FILE_PATH1 = #filePath1#, <!-- 文件地址1 --> FILE_PATH1 = #filePath1#, <!-- 文件地址1 -->
INVENT_RECORD_ID = #inventRecordId# <!-- 存货档案ID --> INVENT_RECORD_ID = #inventRecordId#, <!-- 存货档案ID -->
DELIVERY_DATE = #deliveryDate#
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
......
src/main/resources/META-INF/resources/iPlatV7-index.js
...@@ -2451,7 +2451,7 @@ $(function () { ...@@ -2451,7 +2451,7 @@ $(function () {
if (ei.blocks.result !== undefined){ if (ei.blocks.result !== undefined){
let results = ei.getBlock("result").getMappedRows() let results = ei.getBlock("result").getMappedRows()
$("#sidebar img").attr("src",downloadHref(results[0].docIdPc),results[0].projectEnv); $("#sidebar img").attr("src",downloadHref(results[0].docIdPc,results[0].projectEnv));
} }
}, onFail: function (ei) { }, onFail: function (ei) {
......
src/main/webapp/HP/PZ/HPPZ009.jsp
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="validFlag" class="col-sm-2 col-form-label col-form-label-sm">是否启动</label> <label for="validFlag" class="col-sm-2 col-form-label col-form-label-sm">是否启用</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select class="form-control" id="validFlag"> <select class="form-control" id="validFlag">
<option value="1">是</option> <option value="1">是</option>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="docIdPc" class="col-sm-2 col-form-label">PClog上传</label> <label for="docIdPc" class="col-sm-2 col-form-label">PC端log</label>
<div class="col-sm-6"> <div class="col-sm-6">
<EF:EFUpload ename="docIdPc" cname="PC上传" docTag="hk_filePc" path="A"/> <EF:EFUpload ename="docIdPc" cname="PC上传" docTag="hk_filePc" path="A"/>
<%--<input type="file" class="form-control" id="docIdPc">--%> <%--<input type="file" class="form-control" id="docIdPc">--%>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<input type="hidden" id="PCfileDocId" value=""> <input type="hidden" id="PCfileDocId" value="">
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label for="docIdApp" class="col-sm-2 col-form-label">APPlog上传</label> <label for="docIdApp" class="col-sm-2 col-form-label">APP端log</label>
<div class="col-sm-6"> <div class="col-sm-6">
<EF:EFUpload ename="docIdApp" cname="APP上传" docTag="hk_fileApp" path="A"/> <EF:EFUpload ename="docIdApp" cname="APP上传" docTag="hk_fileApp" path="A"/>
<%--<input type="file" class="form-control" accept="image/*" id="docIdApp">--%> <%--<input type="file" class="form-control" accept="image/*" id="docIdApp">--%>
......
src/main/webapp/HP/SC/HPSC001.jsp
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="customer_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="customer_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFDatePicker ename="inqu_status-0-deliveryDate" cname="交货日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
</div> </div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%> <%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
</EF:EFRegion> </EF:EFRegion>
...@@ -55,6 +56,8 @@ ...@@ -55,6 +56,8 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true" columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
filter="contains"> filter="contains">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="deliveryDate" cname="交货日期" width="100" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" enable="false" width="100" align="center"> <EF:EFComboColumn ename="status" cname="状态" enable="false" width="100" align="center">
<EF:EFOption label="未提交" value="0"/> <EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="已提交" value="1"/> <EF:EFOption label="已提交" value="1"/>
......
src/main/webapp/HP/SC/HPSC002.js
...@@ -61,6 +61,7 @@ $(function () { ...@@ -61,6 +61,7 @@ $(function () {
IPLATUI.EFTree.materialTree.selectTreeNode.projCode = nodeData.projCode; IPLATUI.EFTree.materialTree.selectTreeNode.projCode = nodeData.projCode;
IPLATUI.EFTree.materialTree.selectTreeNode.prdtName = nodeData.prdtName; IPLATUI.EFTree.materialTree.selectTreeNode.prdtName = nodeData.prdtName;
IPLATUI.EFTree.materialTree.selectTreeNode.projName = nodeData.projName; IPLATUI.EFTree.materialTree.selectTreeNode.projName = nodeData.projName;
IPLATUI.EFTree.materialTree.selectTreeNode.deliveryDate = nodeData.deliveryDate;
IPLATUI.EFTree.materialTree.selectTreeNode.lv = nodeData.lv; IPLATUI.EFTree.materialTree.selectTreeNode.lv = nodeData.lv;
// 重新查询EFGrid // 重新查询EFGrid
parentId = nodeData.nodeId; parentId = nodeData.nodeId;
...@@ -174,6 +175,7 @@ $(function () { ...@@ -174,6 +175,7 @@ $(function () {
item['projName'] = selectTreeNode.projName; item['projName'] = selectTreeNode.projName;
item['parentId'] = selectTreeNode.nodeId; item['parentId'] = selectTreeNode.nodeId;
item['parentPrdtName'] = selectTreeNode.prdtName; item['parentPrdtName'] = selectTreeNode.prdtName;
item['deliveryDate'] = selectTreeNode.deliveryDate;
if (selectTreeNode.lv == 1){ if (selectTreeNode.lv == 1){
item['prdtType'] = 4; item['prdtType'] = 4;
}else if (selectTreeNode.lv == 2){ }else if (selectTreeNode.lv == 2){
...@@ -388,9 +390,11 @@ $(function () { ...@@ -388,9 +390,11 @@ $(function () {
var parentPrdtName = IPLATUI.EFTree.materialTree.selectTreeNode.prdtName; var parentPrdtName = IPLATUI.EFTree.materialTree.selectTreeNode.prdtName;
var projCode = IPLATUI.EFTree.materialTree.selectTreeNode.projCode; var projCode = IPLATUI.EFTree.materialTree.selectTreeNode.projCode;
var projName = IPLATUI.EFTree.materialTree.selectTreeNode.projName; var projName = IPLATUI.EFTree.materialTree.selectTreeNode.projName;
var deliveryDate = IPLATUI.EFTree.materialTree.selectTreeNode.deliveryDate;
var lv = IPLATUI.EFTree.materialTree.selectTreeNode.lv; var lv = IPLATUI.EFTree.materialTree.selectTreeNode.lv;
JSColorbox.open({ JSColorbox.open({
href: "HPSC097?methodName=initLoad&inqu_status-0-id=route_001&inqu_status-0-parentId=" + parentId+"&inqu_status-0-projCode="+projCode+"&inqu_status-0-projName="+projName+"&inqu_status-0-parentPrdtName="+parentPrdtName, href: "HPSC097?methodName=initLoad&inqu_status-0-id=route_001&inqu_status-0-parentId=" + parentId+"&inqu_status-0-projCode="+projCode+"&inqu_status-0-projName="+projName+"&inqu_status-0-parentPrdtName="+parentPrdtName+"&inqu_status-0-deliveryDate="+deliveryDate,
title: "<div style='text-align: center;'>导入</div>", title: "<div style='text-align: center;'>导入</div>",
width: "60%", width: "60%",
height: "50%", height: "50%",
......
src/main/webapp/HP/SC/HPSC002.jsp
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<EF:EFColumn enable="false" ename="pgStatus" hidden="true" cname="派工状态"/> <EF:EFColumn enable="false" ename="pgStatus" hidden="true" cname="派工状态"/>
<EF:EFColumn ename="projCode" cname="项目编码" enable="false" hidden="true"/> <EF:EFColumn ename="projCode" cname="项目编码" enable="false" hidden="true"/>
<EF:EFColumn ename="projName" cname="项目名称" enable="false" hidden="true"/> <EF:EFColumn ename="projName" cname="项目名称" enable="false" hidden="true"/>
<EF:EFColumn ename="deliveryDate" cname="交货日期" enable="false" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/> <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
<EF:EFComboColumn ename="prdtType" cname="部件类型" align="center" required="true" <EF:EFComboColumn ename="prdtType" cname="部件类型" align="center" required="true"
filter="contains" width="90" enable="false" hidden="true"> filter="contains" width="90" enable="false" hidden="true">
......
src/main/webapp/HP/SC/HPSC003.js
...@@ -342,7 +342,7 @@ function saveDetail(btn) { ...@@ -342,7 +342,7 @@ function saveDetail(btn) {
} }
let flag = true; let flag = true;
$.each(rows, function(index, item) { $.each(rows, function(index, item) {
let planCommentDate= item.get("planCommentDate"); let planCommentDate= item.get("planCompletionDate"); //item.get("planCommentDate");
let planCompletionDate= item.get("planCompletionDate"); let planCompletionDate= item.get("planCompletionDate");
if(isBlank(planCommentDate)){ if(isBlank(planCommentDate)){
message("选中的第"+(index+1)+"行\"计划开始时间\"，不能为空!"); message("选中的第"+(index+1)+"行\"计划开始时间\"，不能为空!");
......
src/main/webapp/HP/SC/HPSC003.jsp
...@@ -12,8 +12,10 @@ ...@@ -12,8 +12,10 @@
<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3"/> <EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3"/>
<EF:EFInput cname="部件名称" blockId="inqu_status" ename="prdtName" row="0" colWidth="3"/> <EF:EFInput cname="部件名称" blockId="inqu_status" ename="prdtName" row="0" colWidth="3"/>
<%-- <EF:EFInput cname="生产计划单号" blockId="inqu_status" ename="planInfoNo" row="0" colWidth="3"/>--%> <%-- <EF:EFInput cname="生产计划单号" blockId="inqu_status" ename="planInfoNo" row="0" colWidth="3"/>--%>
<EF:EFDatePicker cname="交货日期" blockId="inqu_status" ename="deliveryDate" row="0" colWidth="3"
format="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate" row="0" colWidth="3" <EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate" row="0" colWidth="3"
format="yyyy-MM-dd" readonly="true"/> format="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<%-- </div>--%> <%-- </div>--%>
<%-- <div class="row">--%> <%-- <div class="row">--%>
<EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部"> <EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部">
...@@ -37,6 +39,8 @@ ...@@ -37,6 +39,8 @@
<EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true" width="120"/> <EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true" width="120"/>
<EF:EFColumn enable="false" ename="spec" cname="规格" readonly="true" align="center" width="100" hidden="true"/> <EF:EFColumn enable="false" ename="spec" cname="规格" readonly="true" align="center" width="100" hidden="true"/>
<EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true" width="100"/> <EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true" width="100"/>
<EF:EFColumn ename="deliveryDate" cname="交货日期" width="100" align="center" enable="false"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" width="100" editType="date" <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" width="100" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required='true'/> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required='true'/>
<EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" width="80" readonly="true" align="center"/> <EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" width="80" readonly="true" align="center"/>
...@@ -65,8 +69,8 @@ ...@@ -65,8 +69,8 @@
<EF:EFColumn enable="false" ename="num" readonly="true" width="80" align="right" cname="数量" format="{0:N0}"/> <EF:EFColumn enable="false" ename="num" readonly="true" width="80" align="right" cname="数量" format="{0:N0}"/>
<EF:EFColumn enable="false" ename="unitWt" readonly="true" width="80" align="right" cname="单重(T)"/> <EF:EFColumn enable="false" ename="unitWt" readonly="true" width="80" align="right" cname="单重(T)"/>
<EF:EFColumn ename="totalWt" cname="总重(T)" width="80" align="right" enable="false"/> <EF:EFColumn ename="totalWt" cname="总重(T)" width="80" align="right" enable="false"/>
<EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" width="100" editType="date" <%--<EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" width="100" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>--%>
<EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" width="100" editType="date" <EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" width="100" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date" dateFormat="yyyy/MM/dd" width="100" <EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date" dateFormat="yyyy/MM/dd" width="100"
......
src/main/webapp/HP/SC/HPSC005.jsp
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
<EF:EFInput cname="零件名称" blockId="inqu_status" ename="partName" row="0" colWidth="3"/> <EF:EFInput cname="零件名称" blockId="inqu_status" ename="partName" row="0" colWidth="3"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFDatePicker cname="交货日期" blockId="inqu_status" ename="deliveryDate" row="0" colWidth="3"
format="yyyy-MM-dd"/>
<EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate" row="0" colWidth="3" <EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate" row="0" colWidth="3"
format="yyyy-MM-dd" readonly="true"/> format="yyyy-MM-dd"/>
<EF:EFSelect cname="状态" optionLabel="全部" blockId="inqu_status" ename="status" row="0" colWidth="3"> <EF:EFSelect cname="状态" optionLabel="全部" blockId="inqu_status" ename="status" row="0" colWidth="3">
<EF:EFOption label="未派工" value="0"/> <EF:EFOption label="未派工" value="0"/>
<EF:EFOption label="部分派工" value="1"/> <EF:EFOption label="部分派工" value="1"/>
...@@ -39,6 +41,10 @@ ...@@ -39,6 +41,10 @@
<%--<EF:EFColumn ename="prdtSpec" cname="部件规格" enable="false" width="120" align="center"/>--%> <%--<EF:EFColumn ename="prdtSpec" cname="部件规格" enable="false" width="120" align="center"/>--%>
<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="120" align="center"/> <EF:EFColumn ename="partName" cname="零件名称" enable="false" width="120" align="center"/>
<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="120" align="center"/> <EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="120" align="center"/>
<EF:EFColumn ename="deliveryDate" cname="交货日期" width="100" align="center" enable="false"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="workDate" cname="派工时间" enable="false" width="100" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="100" align="center" <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="100" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="assignedNum" cname="派工数量" enable="false" width="80" align="right" format="{0:N0}"/> <EF:EFColumn ename="assignedNum" cname="派工数量" enable="false" width="80" align="right" format="{0:N0}"/>
......
src/main/webapp/HP/SC/HPSC005A.js
...@@ -33,6 +33,14 @@ $(function () { ...@@ -33,6 +33,14 @@ $(function () {
inInfo.set("field", options.field); inInfo.set("field", options.field);
refreshSelect(container, inInfo); refreshSelect(container, inInfo);
} }
},{
field: "workDate",
attributes: {
class: "i-input-readonly"
},
defaultValue: function () {
return currShortDate();
}
}], }],
onSave: function (e) { onSave: function (e) {
// 阻止后台保存请求，使用自定义保存 // 阻止后台保存请求，使用自定义保存
......
src/main/webapp/HP/SC/HPSC005A.jsp
...@@ -16,14 +16,15 @@ ...@@ -16,14 +16,15 @@
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-prdtName" cname="部件名称" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-prdtName" cname="部件名称" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-partName" cname="零件名称" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-partName" cname="零件名称" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-planCompletionDate" cname="计划完成日期" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-deliveryDate" cname="交货日期" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-planCompletionDate" cname="计划完成日期" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-num" cname="计划数量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-num" cname="计划数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-totalWt" cname="计划重量(T)" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-totalWt" cname="计划重量(T)" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-assignedNum" cname="已派工数量" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-assignedNum" cname="已派工数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-unassignedNum" cname="待派工数量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-unassignedNum" cname="待派工数量" colWidth="4" readonly="true"/>
<EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true"> <EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true">
<EF:EFOption label="未派工" value="0"/> <EF:EFOption label="未派工" value="0"/>
...@@ -44,6 +45,8 @@ ...@@ -44,6 +45,8 @@
<EF:EFColumn ename="factoryName" cname="工厂" enable="false" align="center" hidden="true"/> <EF:EFColumn ename="factoryName" cname="工厂" enable="false" align="center" hidden="true"/>
<EF:EFColumn ename="orgNo" cname="生产组" width="110" align="center" required="true" readonly="true"/> <EF:EFColumn ename="orgNo" cname="生产组" width="110" align="center" required="true" readonly="true"/>
<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" align="center" hidden="true"/> <EF:EFColumn ename="orgName" cname="生产组名称" enable="false" align="center" hidden="true"/>
<EF:EFColumn ename="workDate" cname="派工时间" enable="false" width="100" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<%--<EF:EFColumn ename="orgNo" cname="生产组代码" enable="false" hidden="true"/>--%> <%--<EF:EFColumn ename="orgNo" cname="生产组代码" enable="false" hidden="true"/>--%>
<%--<EF:EFPopupColumn ename="orgName" cname="生产组" width="200" align="center" popupType="ServiceGrid" <%--<EF:EFPopupColumn ename="orgName" cname="生产组" width="200" align="center" popupType="ServiceGrid"
popupTitle="生产组信息" serviceName="HPPZ011" methodName="queryComboBoxAll" popupTitle="生产组信息" serviceName="HPPZ011" methodName="queryComboBoxAll"
......
src/main/webapp/HP/SC/HPSC005B.jsp
...@@ -37,6 +37,10 @@ ...@@ -37,6 +37,10 @@
<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="100" align="center"/> <EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="100" align="center"/>
<%--<EF:EFColumn ename="remark1" cname="零件备注"/>--%> <%--<EF:EFColumn ename="remark1" cname="零件备注"/>--%>
<EF:EFColumn ename="deliveryDate" cname="交货日期" enable="false" width="100" align="center" enable="false"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="workDate" cname="派工时间" enable="false" width="100" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center" <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="completeNum" cname="完成数量" enable="false" width="100" align="right" format="{0:N0}"/> <EF:EFColumn ename="completeNum" cname="完成数量" enable="false" width="100" align="right" format="{0:N0}"/>
......
src/main/webapp/HP/SC/HPSC005C.jsp
...@@ -41,16 +41,18 @@ ...@@ -41,16 +41,18 @@
<EF:EFInput ename="detail-0-unitWt" cname="零件重量(T)" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-unitWt" cname="零件重量(T)" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFDatePicker ename="detail-0-workDate" cname="派工时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFInput ename="detail-0-assignedNum" cname="派工数量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-assignedNum" cname="派工数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-totalWt" cname="派工重量(T)" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-totalWt" cname="派工重量(T)" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-unassignedNum" cname="剩余数量" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-unassignedNum" cname="剩余数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-unTotalWt" cname="剩余重量(T)" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-unTotalWt" cname="剩余重量(T)" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-completeNum" cname="完成数量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-completeNum" cname="完成数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/>
<EF:EFDatePicker ename="detail-0-deliveryDate" cname="交货日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" /> <EF:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFDatePicker ename="detail-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" /> <EF:EFDatePicker ename="detail-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
</div> </div>
......
src/main/webapp/HP/SC/HPSC005D.jsp
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFDatePicker ename="detail-0-deliveryDate" cname="交货日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" /> <EF:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFDatePicker ename="detail-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" /> <EF:EFDatePicker ename="detail-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
</div> </div>
......
src/main/webapp/HP/SC/HPSC006.js
...@@ -97,6 +97,7 @@ $(function () { ...@@ -97,6 +97,7 @@ $(function () {
var productionOrderNo = e.model['prodOrderNo']; var productionOrderNo = e.model['prodOrderNo'];
var projCode = e.model['projCode']; var projCode = e.model['projCode'];
var projName = e.model['projName']; var projName = e.model['projName'];
var deliveryDate = e.model['deliveryDate'];
info.set("productionOrderNo",productionOrderNo); info.set("productionOrderNo",productionOrderNo);
EiCommunicator.send("HPSC006","queryDetail",info,{ EiCommunicator.send("HPSC006","queryDetail",info,{
...@@ -105,6 +106,7 @@ $(function () { ...@@ -105,6 +106,7 @@ $(function () {
$('#productionOrderNo').val(productionOrderNo) $('#productionOrderNo').val(productionOrderNo)
$('#projCode').val(projCode) $('#projCode').val(projCode)
$('#projName').val(projName) $('#projName').val(projName)
$('#deliveryDate').val(deliveryDate)
},onFail:function(ei){} },onFail:function(ei){}
},{async:false}); },{async:false});
}, },
......
src/main/webapp/HP/SC/HPSC006.jsp
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
<EF:EFInput blockId="inqu_status" ename="projCode" cname="项目号:" colWidth="3" row="0"/> <EF:EFInput blockId="inqu_status" ename="projCode" cname="项目号:" colWidth="3" row="0"/>
<EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" colWidth="3" row="0"/> <EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" colWidth="3" row="0"/>
<EF:EFInput blockId="inqu_status" ename="prodOrderNo" cname="生产订单号:" colWidth="3" row="0"/> <EF:EFInput blockId="inqu_status" ename="prodOrderNo" cname="生产订单号:" colWidth="3" row="0"/>
<EF:EFDatePicker blockId="inqu_status" ename="deliveryDate" cname="交货日期" row="0" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3" />
<EF:EFDatePicker blockId="inqu_status" ename="workDate" cname="派工时间" row="0" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3" />
<EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" colWidth="3" format="yyyy-MM-dd" /> <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" colWidth="3" format="yyyy-MM-dd" />
</div> </div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%> <%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
...@@ -34,6 +36,10 @@ ...@@ -34,6 +36,10 @@
<EF:EFColumn enable="false" ename="prodOrderNo" cname="生产订单号"/> <EF:EFColumn enable="false" ename="prodOrderNo" cname="生产订单号"/>
<EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/> <EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/>
<EF:EFColumn enable="false" ename="partName" cname="零件名称"/> <EF:EFColumn enable="false" ename="partName" cname="零件名称"/>
<EF:EFColumn ename="deliveryDate" cname="交货日期" enable="false" width="100" align="center" enable="false"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="workDate" cname="派工时间" enable="false" width="100" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn enable="false" ename="planCompletionDate" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" <EF:EFColumn enable="false" ename="planCompletionDate" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"
cname="计划完成日期"/> cname="计划完成日期"/>
...@@ -44,6 +50,7 @@ ...@@ -44,6 +50,7 @@
<EF:EFInput ename="projCode" type="hidden"/> <EF:EFInput ename="projCode" type="hidden"/>
<EF:EFInput ename="projName" type="hidden"/> <EF:EFInput ename="projName" type="hidden"/>
<EF:EFInput ename="productionOrderNo" type="hidden"/> <EF:EFInput ename="productionOrderNo" type="hidden"/>
<EF:EFInput ename="deliveryDate" type="hidden"/>
<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="operator" cname="操作" width="100" enable="false" readonly="false"/> <EF:EFColumn ename="operator" cname="操作" width="100" enable="false" readonly="false"/>
......
src/main/webapp/HP/SC/HPSC006A.jsp
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
</EF:EFSelect> </EF:EFSelect>
</div> </div>
<div class="row"> <div class="row">
<EF:EFDatePicker blockId="inqu_status" ename="deliveryDate" cname="交货日期" row="0" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
<EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" format="yyyy-MM-dd" colWidth="3" /> <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" format="yyyy-MM-dd" colWidth="3" />
</div> </div>
</EF:EFRegion> </EF:EFRegion>
...@@ -42,6 +43,8 @@ ...@@ -42,6 +43,8 @@
<EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="partName" cname="零件名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="inventName" cname="材料名称" enable="false" width="100" align="center"/> <EF:EFColumn ename="inventName" cname="材料名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="orgName" cname="下料组" enable="false" width="100" align="center"/> <EF:EFColumn ename="orgName" cname="下料组" enable="false" width="100" align="center"/>
<EF:EFColumn ename="deliveryDate" cname="交货日期" enable="false" width="100" align="center" enable="false"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center" <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/> editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn enable="false" ename="cutSchedule" cname="下料进度" format="{0:N2}" width="80" readonly="true" align="center"/> <EF:EFColumn enable="false" ename="cutSchedule" cname="下料进度" format="{0:N2}" width="80" readonly="true" align="center"/>
......
src/main/webapp/HP/SC/HPSC006B.jsp
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<EF:EFInput ename="result-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/> <EF:EFInput ename="result-0-actualCompletionTotalWt" cname="完成重量(T)" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFDatePicker ename="result-0-deliveryDate" cname="交货日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFDatePicker ename="result-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" /> <EF:EFDatePicker ename="result-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
<EF:EFDatePicker ename="result-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" /> <EF:EFDatePicker ename="result-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
</div> </div>
......
src/main/webapp/HP/SC/HPSC007.jsp
...@@ -27,10 +27,12 @@ ...@@ -27,10 +27,12 @@
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-actualCompletionNum" cname="完工数量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-actualCompletionNum" cname="完工数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完工重量(T)" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完工重量(T)" colWidth="4" readonly="true"/>
<EF:EFDatePicker cname="计划完成日期" ename="detail-0-planCompletionDate" row="0" colWidth="4" <EF:EFDatePicker cname="计划完成日期" ename="detail-0-planCompletionDate" colWidth="4"
format="yyyy-MM-dd" readonly="true"/> format="yyyy-MM-dd" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFDatePicker cname="交货日期" ename="detail-0-deliveryDate" colWidth="4"
format="yyyy-MM-dd" readonly="true"/>
<EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true"> <EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true">
<EF:EFOption label="计划中" value="0"/> <EF:EFOption label="计划中" value="0"/>
<EF:EFOption label="生产中" value="1"/> <EF:EFOption label="生产中" value="1"/>
......
src/main/webapp/HP/SC/HPSC011.jsp
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="customer_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="customer_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFDatePicker ename="inqu_status-0-deliveryDate" cname="交货日期" role="date" enable="false" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
</div> </div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%> <%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
</EF:EFRegion> </EF:EFRegion>
...@@ -60,6 +61,8 @@ ...@@ -60,6 +61,8 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true" columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
filter="contains"> filter="contains">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="deliveryDate" cname="交货日期" width="100" align="center"
editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFComboColumn ename="materialStatus" cname="物料提交状态" enable="false" width="100" align="center"> <EF:EFComboColumn ename="materialStatus" cname="物料提交状态" enable="false" width="100" align="center">
<EF:EFOption label="未提交" value="0"/> <EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="部分提交" value="1"/> <EF:EFOption label="部分提交" value="1"/>
......
src/main/webapp/HP/SC/HPSC097.js
...@@ -23,6 +23,7 @@ let upload = function () { ...@@ -23,6 +23,7 @@ let upload = function () {
let projName = $("#inqu_status-0-projName").val(); let projName = $("#inqu_status-0-projName").val();
let parentPrdtName = $("#inqu_status-0-parentPrdtName").val(); let parentPrdtName = $("#inqu_status-0-parentPrdtName").val();
let productionOrderNo = $("#inqu_status-0-productionOrderNo").val(); let productionOrderNo = $("#inqu_status-0-productionOrderNo").val();
let deliveryDate = $("#inqu_status-0-deliveryDate").val();
let _IPLAT = IPLAT; let _IPLAT = IPLAT;
_IPLAT.progress($("body"), true); _IPLAT.progress($("body"), true);
let formData = new FormData(); let formData = new FormData();
...@@ -33,6 +34,7 @@ let upload = function () { ...@@ -33,6 +34,7 @@ let upload = function () {
formData.append("projCode", projCode); formData.append("projCode", projCode);
formData.append("projName", projName); formData.append("projName", projName);
formData.append("parentPrdtName", parentPrdtName); formData.append("parentPrdtName", parentPrdtName);
formData.append("deliveryDate", deliveryDate);
} }
if(id === 'route_002'){ if(id === 'route_002'){
formData.append("id", id); formData.append("id", id);
...@@ -40,6 +42,7 @@ let upload = function () { ...@@ -40,6 +42,7 @@ let upload = function () {
formData.append("productionOrderNo", productionOrderNo); formData.append("productionOrderNo", productionOrderNo);
formData.append("projCode", projCode); formData.append("projCode", projCode);
formData.append("projName", projName); formData.append("projName", projName);
formData.append("deliveryDate", deliveryDate);
} }
formData.append("file", $("#inqu_status-0-file")[0].files[0]); formData.append("file", $("#inqu_status-0-file")[0].files[0]);
$.ajax({ $.ajax({
......
src/main/webapp/HP/SC/HPSC097.jsp
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<EF:EFInput ename="inqu_status-0-projName" cname="项目名称" type="hidden"/> <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" type="hidden"/>
<EF:EFInput ename="inqu_status-0-parentPrdtName" cname="项目部件名称" type="hidden"/> <EF:EFInput ename="inqu_status-0-parentPrdtName" cname="项目部件名称" type="hidden"/>
<EF:EFInput ename="inqu_status-0-productionOrderNo" cname="生产订单号" type="hidden"/> <EF:EFInput ename="inqu_status-0-productionOrderNo" cname="生产订单号" type="hidden"/>
<EF:EFInput ename="inqu_status-0-deliveryDate" cname="交货日期" type="hidden"/>
<EF:EFInput cname="上传文件" blockId="inqu_status" ename="file" row="0" type="file" /> <EF:EFInput cname="上传文件" blockId="inqu_status" ename="file" row="0" type="file" />
<%--<button id="btn_upload" type="submit">提交</button>--%> <%--<button id="btn_upload" type="submit">提交</button>--%>
<%-- <EF:EFButton cname="提交" ename="btn_upload"></EF:EFButton>--%> <%-- <EF:EFButton cname="提交" ename="btn_upload"></EF:EFButton>--%>
......
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