Skip to content

H
hp-smart
Commit 09cc56b5 by 宋祥
Options

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

parents e195dfb6 00a7a891
Showing with 851 additions and 57 deletions
src/main/java/com/baosight/hpjx/core/constant/CommonConstant.java
...@@ -52,6 +52,8 @@ public class CommonConstant { ...@@ -52,6 +52,8 @@ public class CommonConstant {
public static final String ID = "id"; public static final String ID = "id";
// 生产订单号 // 生产订单号
public static final String PROD_ORDER_NO = "prodOrderNo"; public static final String PROD_ORDER_NO = "prodOrderNo";
// 生产订单号2
public static final String PRODUCTTION_ORDER_NO = "productionOrderNo";
} }
} }
src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ002.java
...@@ -35,6 +35,9 @@ public class HPPZ002 extends DaoEPBase { ...@@ -35,6 +35,9 @@ public class HPPZ002 extends DaoEPBase {
public static final String FIELD_UPDATED_BY = "updatedBy"; /* 更新人*/ public static final String FIELD_UPDATED_BY = "updatedBy"; /* 更新人*/
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_COMPANY_NAME = "companyName"; /* 公司*/
public static final String FIELD_HEAD_NAME = "headName"; /* 负责人*/
public static final String FIELD_PHONE_NAME = "phoneName"; /* 负责人联系方式*/
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"; /* 企业编码 预留*/
...@@ -50,6 +53,9 @@ public class HPPZ002 extends DaoEPBase { ...@@ -50,6 +53,9 @@ public class HPPZ002 extends DaoEPBase {
public static final String COL_UPDATED_BY = "UPDATED_BY"; /* 更新人*/ public static final String COL_UPDATED_BY = "UPDATED_BY"; /* 更新人*/
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_COMPANY_NAME = "COMPANY_NAME"; /* 公司*/
public static final String HEAD_NAME = "HEAD_NAME"; /* 负责人*/
public static final String PHONE_NAME = "PHONE_NAME"; /* 负责人联系方式*/
public static final String QUERY = "HPPZ002.query"; public static final String QUERY = "HPPZ002.query";
public static final String COUNT = "HPPZ002.count"; public static final String COUNT = "HPPZ002.count";
...@@ -71,6 +77,9 @@ public class HPPZ002 extends DaoEPBase { ...@@ -71,6 +77,9 @@ public class HPPZ002 extends DaoEPBase {
private String updatedBy = " "; /* 更新人*/ private String updatedBy = " "; /* 更新人*/
private String updatedName = " "; /* 更新人名称*/ private String updatedName = " "; /* 更新人名称*/
private String updatedTime = " "; /* 更新时间*/ private String updatedTime = " "; /* 更新时间*/
private String companyName = " "; /* 公司*/
private String headName = " "; /* 负责人*/
private String phoneName = " "; /* 负责人联系方式*/
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -135,6 +144,18 @@ public class HPPZ002 extends DaoEPBase { ...@@ -135,6 +144,18 @@ public class HPPZ002 extends DaoEPBase {
eiColumn.setDescName("更新时间"); eiColumn.setDescName("更新时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_HEAD_NAME);
eiColumn.setDescName("负责人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PHONE_NAME);
eiColumn.setDescName("负责人联系方式");
eiMetadata.addMeta(eiColumn);
} }
...@@ -369,6 +390,31 @@ public class HPPZ002 extends DaoEPBase { ...@@ -369,6 +390,31 @@ public class HPPZ002 extends DaoEPBase {
public void setUpdatedTime(String updatedTime) { public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime; this.updatedTime = updatedTime;
} }
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getHeadName() {
return headName;
}
public void setHeadName(String headName) {
this.headName = headName;
}
public String getPhoneName() {
return phoneName;
}
public void setPhoneName(String phoneName) {
this.phoneName = phoneName;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -391,6 +437,9 @@ public class HPPZ002 extends DaoEPBase { ...@@ -391,6 +437,9 @@ public class HPPZ002 extends DaoEPBase {
setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy)); setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
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));
setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
setHeadName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_HEAD_NAME)), headName));
setPhoneName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PHONE_NAME)), phoneName));
} }
/** /**
...@@ -414,7 +463,9 @@ public class HPPZ002 extends DaoEPBase { ...@@ -414,7 +463,9 @@ public class HPPZ002 extends DaoEPBase {
map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY))); map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
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_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
map.put(FIELD_HEAD_NAME, StringUtils.toString(headName, eiMetadata.getMeta(FIELD_HEAD_NAME)));
map.put(FIELD_PHONE_NAME, StringUtils.toString(phoneName, eiMetadata.getMeta(FIELD_PHONE_NAME)));
return map; return map;
} }
} }
src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ003.java
...@@ -37,6 +37,10 @@ public class HPPZ003 extends DaoEPBase { ...@@ -37,6 +37,10 @@ public class HPPZ003 extends DaoEPBase {
public static final String FIELD_UPDATED_BY = "updatedBy"; /* 更新人*/ public static final String FIELD_UPDATED_BY = "updatedBy"; /* 更新人*/
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_COMPANY_NAME = "companyName"; /* 公司*/
public static final String FIELD_HEAD_NAME = "headName"; /* 负责人*/
public static final String FIELD_PHONE_NAME = "phoneName"; /* 负责人联系方式*/
public static final String FIELD_PUT_ADDRESS = "putAddress"; /* 收货地址*/
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"; /* 企业编码 预留*/
...@@ -52,6 +56,9 @@ public class HPPZ003 extends DaoEPBase { ...@@ -52,6 +56,9 @@ public class HPPZ003 extends DaoEPBase {
public static final String COL_UPDATED_BY = "UPDATED_BY"; /* 更新人*/ public static final String COL_UPDATED_BY = "UPDATED_BY"; /* 更新人*/
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_COMPANY_NAME = "COMPANY_NAME"; /* 公司*/
public static final String HEAD_NAME = "HEAD_NAME"; /* 负责人*/
public static final String PHONE_NAME = "PHONE_NAME"; /* 负责人联系方式*/
public static final String QUERY = "HPPZ003.query"; public static final String QUERY = "HPPZ003.query";
public static final String COUNT = "HPPZ003.count"; public static final String COUNT = "HPPZ003.count";
...@@ -73,6 +80,10 @@ public class HPPZ003 extends DaoEPBase { ...@@ -73,6 +80,10 @@ public class HPPZ003 extends DaoEPBase {
private String updatedBy = " "; /* 更新人*/ private String updatedBy = " "; /* 更新人*/
private String updatedName = " "; /* 更新人名称*/ private String updatedName = " "; /* 更新人名称*/
private String updatedTime = " "; /* 更新时间*/ private String updatedTime = " "; /* 更新时间*/
private String companyName = " "; /* 公司*/
private String headName = " "; /* 负责人*/
private String phoneName = " "; /* 负责人联系方式*/
private String putAddress = " "; /* 收货地址*/
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -137,6 +148,22 @@ public class HPPZ003 extends DaoEPBase { ...@@ -137,6 +148,22 @@ public class HPPZ003 extends DaoEPBase {
eiColumn.setDescName("更新时间"); eiColumn.setDescName("更新时间");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_NAME);
eiColumn.setDescName("公司");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_HEAD_NAME);
eiColumn.setDescName("负责人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PHONE_NAME);
eiColumn.setDescName("负责人联系方式");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PUT_ADDRESS);
eiColumn.setDescName("收货地址");
eiMetadata.addMeta(eiColumn);
} }
...@@ -371,6 +398,39 @@ public class HPPZ003 extends DaoEPBase { ...@@ -371,6 +398,39 @@ public class HPPZ003 extends DaoEPBase {
public void setUpdatedTime(String updatedTime) { public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime; this.updatedTime = updatedTime;
} }
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getHeadName() {
return headName;
}
public void setHeadName(String headName) {
this.headName = headName;
}
public String getPhoneName() {
return phoneName;
}
public void setPhoneName(String phoneName) {
this.phoneName = phoneName;
}
public String getPutAddress() {
return putAddress;
}
public void setPutAddress(String putAddress) {
this.putAddress = putAddress;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -393,6 +453,10 @@ public class HPPZ003 extends DaoEPBase { ...@@ -393,6 +453,10 @@ public class HPPZ003 extends DaoEPBase {
setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy)); setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
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));
setCompanyName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_NAME)), companyName));
setHeadName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_HEAD_NAME)), headName));
setPhoneName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PHONE_NAME)), phoneName));
setPutAddress(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PUT_ADDRESS)), putAddress));
} }
/** /**
...@@ -416,6 +480,10 @@ public class HPPZ003 extends DaoEPBase { ...@@ -416,6 +480,10 @@ public class HPPZ003 extends DaoEPBase {
map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY))); map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
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_COMPANY_NAME, StringUtils.toString(companyName, eiMetadata.getMeta(FIELD_COMPANY_NAME)));
map.put(FIELD_HEAD_NAME, StringUtils.toString(headName, eiMetadata.getMeta(FIELD_HEAD_NAME)));
map.put(FIELD_PHONE_NAME, StringUtils.toString(phoneName, eiMetadata.getMeta(FIELD_PHONE_NAME)));
map.put(FIELD_PUT_ADDRESS, StringUtils.toString(putAddress, eiMetadata.getMeta(FIELD_PUT_ADDRESS)));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ002.xml
...@@ -16,7 +16,10 @@ ...@@ -16,7 +16,10 @@
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 --> UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 更新人名称 --> UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
UPDATED_TIME as "updatedTime" <!-- 更新时间 --> UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
COMPANY_NAME as "companyName", <!--公司 -->
HEAD_NAME as "headName", <!--负责人-->
PHONE_NAME as "phoneName" <!--负责人联系方式-->
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -45,6 +48,15 @@ ...@@ -45,6 +48,15 @@
<isNotEmpty prepend=" AND " property="status"> <isNotEmpty prepend=" AND " property="status">
STATUS = #status# STATUS = #status#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="companyName">
COMPANY_NAME LIKE CONCAT('%', #companyName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="headName">
HEAD_NAME LIKE CONCAT('%', #headName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="phoneName">
PHONE_NAME = #phoneName#
</isNotEmpty>
</sql> </sql>
<sql id="order"> <sql id="order">
...@@ -83,10 +95,14 @@ ...@@ -83,10 +95,14 @@
STATUS, <!-- 状态 0禁用 1启用 --> STATUS, <!-- 状态 0禁用 1启用 -->
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 --> CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME <!-- 创建时间 --> CREATED_TIME, <!-- 创建时间 -->
COMPANY_NAME,
HEAD_NAME,
PHONE_NAME
) VALUES ( ) VALUES (
#companyCode#, #depCode#, #custType#, #custCode#, #custName#, #address#, #companyCode#, #depCode#, #custType#, #custCode#, #custName#, #address#,
#status#, #createdBy#, #createdName#, #createdTime# #status#, #createdBy#, #createdName#, #createdTime# , #companyName# , #headName#
, #phoneName#
) )
</insert> </insert>
...@@ -104,7 +120,10 @@ ...@@ -104,7 +120,10 @@
STATUS = #status#, <!-- 状态 0禁用 1启用 --> STATUS = #status#, <!-- 状态 0禁用 1启用 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 --> UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 --> UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 --> UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
COMPANY_NAME = #companyName#,
HEAD_NAME = #headName#,
PHONE_NAME = #phoneName#
WHERE ID = #id# WHERE ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ003.xml
...@@ -16,7 +16,11 @@ ...@@ -16,7 +16,11 @@
CREATED_TIME as "createdTime", <!-- 创建时间 --> CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 --> UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 更新人名称 --> UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
UPDATED_TIME as "updatedTime" <!-- 更新时间 --> UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
COMPANY_NAME as "companyName", <!--公司 -->
HEAD_NAME as "headName", <!--负责人-->
PHONE_NAME as "phoneName", <!--负责人联系方式-->
PUT_ADDRESS as "putAddress" <!--收货地址-->
</sql> </sql>
<sql id="condition"> <sql id="condition">
...@@ -45,6 +49,18 @@ ...@@ -45,6 +49,18 @@
<isNotEmpty prepend=" AND " property="status"> <isNotEmpty prepend=" AND " property="status">
STATUS = #status# STATUS = #status#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="companyName">
COMPANY_NAME LIKE CONCAT('%', #companyName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="headName">
HEAD_NAME LIKE CONCAT('%', #headName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="phoneName">
PHONE_NAME = #phoneName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="putAddress">
PUT_ADDRESS = #putAddress#
</isNotEmpty>
</sql> </sql>
<sql id="order"> <sql id="order">
...@@ -82,10 +98,15 @@ ...@@ -82,10 +98,15 @@
STATUS, <!-- 状态 0未启用 1启用 --> STATUS, <!-- 状态 0未启用 1启用 -->
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 --> CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME <!-- 创建时间 --> CREATED_TIME, <!-- 创建时间 -->
COMPANY_NAME,
HEAD_NAME,
PHONE_NAME,
PUT_ADDRESS
) VALUES ( ) VALUES (
#companyCode#, #depCode#, #custType#, #custCode#, #custName#, #address#, #companyCode#, #depCode#, #custType#, #custCode#, #custName#, #address#,
#status#, #createdBy#, #createdName#, #createdTime# #status#, #createdBy#, #createdName#, #createdTime# , #companyName# , #headName#
, #phoneName# , #putAddress#
) )
</insert> </insert>
...@@ -103,7 +124,11 @@ ...@@ -103,7 +124,11 @@
STATUS = #status#, <!-- 状态 0未启用 1启用 --> STATUS = #status#, <!-- 状态 0未启用 1启用 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 --> UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 --> UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 --> UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
COMPANY_NAME = #companyName#,
HEAD_NAME = #headName#,
PHONE_NAME = #phoneName#,
PUT_ADDRESS = #putAddress#
WHERE ID = #id# WHERE ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002A.java
...@@ -26,6 +26,7 @@ public class HPSC002A extends DaoEPBase { ...@@ -26,6 +26,7 @@ public class HPSC002A extends DaoEPBase {
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码 预留*/ public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码 预留*/
public static final String FIELD_MAT_ID = "matId"; /* 物料ID*/ public static final String FIELD_MAT_ID = "matId"; /* 物料ID*/
public static final String FIELD_DOC_ID = "docId"; /* 文件ID*/ public static final String FIELD_DOC_ID = "docId"; /* 文件ID*/
public static final String FIELD_DOC_NAME = "docName"; /* 文件名称*/
public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/ public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/
public static final String FIELD_CREATED_NAME = "createdName"; /* 创建人名称*/ public static final String FIELD_CREATED_NAME = "createdName"; /* 创建人名称*/
public static final String FIELD_CREATED_TIME = "createdTime"; /* 创建时间*/ public static final String FIELD_CREATED_TIME = "createdTime"; /* 创建时间*/
...@@ -39,6 +40,7 @@ public class HPSC002A extends DaoEPBase { ...@@ -39,6 +40,7 @@ public class HPSC002A 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_MAT_ID = "MAT_ID"; /* 物料ID*/ public static final String COL_MAT_ID = "MAT_ID"; /* 物料ID*/
public static final String COL_DOC_ID = "DOC_ID"; /* 文件ID*/ public static final String COL_DOC_ID = "DOC_ID"; /* 文件ID*/
public static final String COL_DOC_NAME = "DOC_NAME"; /* 文件文件*/
public static final String COL_CREATED_BY = "CREATED_BY"; /* 创建人*/ public static final String COL_CREATED_BY = "CREATED_BY"; /* 创建人*/
public static final String COL_CREATED_NAME = "CREATED_NAME"; /* 创建人名称*/ public static final String COL_CREATED_NAME = "CREATED_NAME"; /* 创建人名称*/
public static final String COL_CREATED_TIME = "CREATED_TIME"; /* 创建时间*/ public static final String COL_CREATED_TIME = "CREATED_TIME"; /* 创建时间*/
...@@ -65,7 +67,7 @@ public class HPSC002A extends DaoEPBase { ...@@ -65,7 +67,7 @@ public class HPSC002A extends DaoEPBase {
private String updatedName = " "; /* 修改人名称*/ private String updatedName = " "; /* 修改人名称*/
private String updatedTime = " "; /* 修改时间*/ private String updatedTime = " "; /* 修改时间*/
private String bizType = " "; /* 业务类型*/ private String bizType = " "; /* 业务类型*/
private String docName = " "; /* 文件名称*/
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
...@@ -93,6 +95,10 @@ public class HPSC002A extends DaoEPBase { ...@@ -93,6 +95,10 @@ public class HPSC002A extends DaoEPBase {
eiColumn.setDescName("文件ID"); eiColumn.setDescName("文件ID");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DOC_NAME);
eiColumn.setDescName("文件名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY); eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("创建人"); eiColumn.setDescName("创建人");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
...@@ -212,6 +218,22 @@ public class HPSC002A extends DaoEPBase { ...@@ -212,6 +218,22 @@ public class HPSC002A extends DaoEPBase {
this.docId = docId; this.docId = docId;
} }
/** /**
* get the docName - 文件名称.
* @return the docName
*/
public String getDocName() {
return this.getDocName();
}
/**
* set the docName - 文件名称.
*
* @param docName - 文件名称
*/
public void setDocName(String docName) {
this.docName = docName;
}
/**
* get the createdBy - 创建人. * get the createdBy - 创建人.
* @return the createdBy * @return the createdBy
*/ */
...@@ -336,6 +358,7 @@ public class HPSC002A extends DaoEPBase { ...@@ -336,6 +358,7 @@ public class HPSC002A extends DaoEPBase {
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode)); setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
setMatId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_MAT_ID)), matId)); setMatId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_MAT_ID)), matId));
setDocId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_ID)), docId)); setDocId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_ID)), docId));
setDocName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOC_NAME)), docName));
setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy)); setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName)); setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime)); setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
...@@ -357,6 +380,7 @@ public class HPSC002A extends DaoEPBase { ...@@ -357,6 +380,7 @@ public class HPSC002A extends DaoEPBase {
map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE))); map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
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_DOC_ID, StringUtils.toString(docId, eiMetadata.getMeta(FIELD_DOC_ID))); map.put(FIELD_DOC_ID, StringUtils.toString(docId, eiMetadata.getMeta(FIELD_DOC_ID)));
map.put(FIELD_DOC_NAME, StringUtils.toString(docName, eiMetadata.getMeta(FIELD_DOC_NAME)));
map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY))); map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME))); map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME))); map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME)));
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC006.java
...@@ -58,6 +58,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -58,6 +58,7 @@ public class HPSC006 extends DaoEPBase {
public static final String FIELD_PRDT_NAME = "prdtName"; /* 产品名称*/ public static final String FIELD_PRDT_NAME = "prdtName"; /* 产品名称*/
public static final String FIELD_PART_NAME = "partName"; /* 零件名称*/ public static final String FIELD_PART_NAME = "partName"; /* 零件名称*/
public static final String FIELD_CUT_SCHEDULE = "cutSchedule"; /*下料进度*/
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"; /* 企业编码 预留*/
...@@ -94,12 +95,15 @@ public class HPSC006 extends DaoEPBase { ...@@ -94,12 +95,15 @@ public class HPSC006 extends DaoEPBase {
public static final String COL_MATERIAL = "MATERIAL"; /* 材质*/ public static final String COL_MATERIAL = "MATERIAL"; /* 材质*/
public static final String COL_PRDT_NAME = "PRDT_NAME"; /* 产品名称*/ public static final String COL_PRDT_NAME = "PRDT_NAME"; /* 产品名称*/
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 QUERY = "HPSC006.query"; public static final String QUERY = "HPSC006.query";
public static final String COUNT = "HPSC006.count"; public static final String COUNT = "HPSC006.count";
public static final String INSERT = "HPSC006.insert"; public static final String INSERT = "HPSC006.insert";
public static final String UPDATE = "HPSC006.update"; public static final String UPDATE = "HPSC006.update";
public static final String DELETE = "HPSC006.delete"; public static final String DELETE = "HPSC006.delete";
public static final String QUERY2 = "HPSC006A.query";
private Long id = new Long(0); private Long id = new Long(0);
private String companyCode = " "; /* 企业编码 预留*/ private String companyCode = " "; /* 企业编码 预留*/
...@@ -136,6 +140,8 @@ public class HPSC006 extends DaoEPBase { ...@@ -136,6 +140,8 @@ public class HPSC006 extends DaoEPBase {
private String material = " "; /* 材质*/ private String material = " "; /* 材质*/
private String prdtName = " "; /* 产品名称*/ private String prdtName = " "; /* 产品名称*/
private String partName = " "; /* 零件名称*/ private String partName = " "; /* 零件名称*/
private String cutSchedule = "";
/** /**
* initialize the metadata. * initialize the metadata.
*/ */
...@@ -306,6 +312,10 @@ public class HPSC006 extends DaoEPBase { ...@@ -306,6 +312,10 @@ public class HPSC006 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_PART_NAME); eiColumn = new EiColumn(FIELD_PART_NAME);
eiColumn.setDescName("零件名称"); eiColumn.setDescName("零件名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CUT_SCHEDULE);
eiColumn.setDescName("下料进度");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -876,6 +886,15 @@ public class HPSC006 extends DaoEPBase { ...@@ -876,6 +886,15 @@ public class HPSC006 extends DaoEPBase {
public void setPartName(String partName) { public void setPartName(String partName) {
this.partName = partName; this.partName = partName;
} }
public String getCutSchedule() {
return cutSchedule;
}
public void setCutSchedule(String cutSchedule) {
this.cutSchedule = cutSchedule;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -919,6 +938,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -919,6 +938,7 @@ public class HPSC006 extends DaoEPBase {
setMaterial(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_MATERIAL)), material)); setMaterial(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_MATERIAL)), material));
setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName)); setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
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));
} }
/** /**
...@@ -963,6 +983,7 @@ public class HPSC006 extends DaoEPBase { ...@@ -963,6 +983,7 @@ public class HPSC006 extends DaoEPBase {
map.put(FIELD_MATERIAL, StringUtils.toString(material, eiMetadata.getMeta(FIELD_MATERIAL))); map.put(FIELD_MATERIAL, StringUtils.toString(material, eiMetadata.getMeta(FIELD_MATERIAL)));
map.put(FIELD_PRDT_NAME, StringUtils.toString(prdtName, eiMetadata.getMeta(FIELD_PRDT_NAME))); map.put(FIELD_PRDT_NAME, StringUtils.toString(prdtName, eiMetadata.getMeta(FIELD_PRDT_NAME)));
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)));
return map; return map;
} }
} }
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java
...@@ -137,7 +137,7 @@ public class ServiceHPSC001 extends ServiceBase { ...@@ -137,7 +137,7 @@ public class ServiceHPSC001 extends ServiceBase {
eiInfo.setStatus(EiConstant.STATUS_SUCCESS); eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("删除成功！"); eiInfo.setMsg("删除成功！");
return eiInfo; return query(eiInfo);
} }
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002A.java
...@@ -55,15 +55,7 @@ public class ServiceHPSC002A extends ServiceEPBase { ...@@ -55,15 +55,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
if (CollectionUtils.isNotEmpty(dbSc002s) || CollectionUtils.isNotEmpty(HPSC006)) { if (CollectionUtils.isNotEmpty(dbSc002s) || CollectionUtils.isNotEmpty(HPSC006)) {
inInfo.set("inqu_status-0-bizType", queryMap.get("bizType")); inInfo.set("inqu_status-0-bizType", queryMap.get("bizType"));
inInfo.set("inqu_status-0-matId", queryMap.get("id")); inInfo.set("inqu_status-0-matId", queryMap.get("id"));
if (bizType.equals("WL")) {
HPSC002 dbSc002 = dbSc002s.get(0);
inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
inInfo.set("inqu_status-0-prdtName", dbSc002.getPrdtName());
} else if (bizType.equals("XL")) {
HPSC006 dbSc002 = HPSC006.get(0);
inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
inInfo.set("inqu_status-0-prdtName", dbSc002.getInventName());
}
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002A().eiMetadata); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC002A().eiMetadata);
} }
} catch (PlatException e) { } catch (PlatException e) {
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006A.java 0 → 100644
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.HPConstants;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.hp.sc.domain.HPSC006;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.MapUtils;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.Map;
/**
*
*/
public class ServiceHPSC006A extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "下料清单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
HPSC006 HPSC006 = new HPSC006();
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
String prodOrderNo = MapUtils.getString(queryMap, CommonConstant.Field.PROD_ORDER_NO);
HPSC006.setProductionOrderNo(prodOrderNo);
EiInfo outInfo = super.initLoad(inInfo, HPSC006);
outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC006.eiMetadata);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null, false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID), null, false);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "下料清单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
HPSC006 HPSC006 = new HPSC006();
/* 调用EI查询方法.*/
EiInfo outInfo = super.query(inInfo, "HPSC006A.query", new HPSC006());
EiBlock blcok = outInfo.addBlock(HPConstants.BLOCK_DETAIL);
blcok.setBlockMeta(new HPSC006().eiMetadata);
return outInfo;
}
}
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006B.java 0 → 100644
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.HPConstants;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.hp.sc.domain.HPSC005;
import com.baosight.hpjx.hp.sc.domain.HPSC005A;
import com.baosight.hpjx.hp.sc.domain.HPSC006;
import com.baosight.hpjx.hp.sc.tools.HPSCTools;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.MapUtils;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.Map;
/**
*
*/
public class ServiceHPSC006B extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "下料清单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
String prodOrderNo = MapUtils.getString(queryMap, CommonConstant.Field.PROD_ORDER_NO);
HPSC006 dbSc006 = HPSCTools.HpSc005.getHPSC006(prodOrderNo);
inInfo.addBlock(CommonConstant.Field.DETAIL).addRow(dbSc006);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC006().eiMetadata);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "下料清单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
HPSC006 HPSC006 = new HPSC006();
/* 调用EI查询方法.*/
EiInfo outInfo = super.query(inInfo, "HPSC006A.query", new HPSC006());
EiBlock blcok = outInfo.addBlock(HPConstants.BLOCK_DETAIL);
blcok.setBlockMeta(new HPSC006().eiMetadata);
return outInfo;
}
}
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005C.xml
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode"> <isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode# A.COMPANY_CODE = #companyCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="projCode"> <isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE like CONCAT('%', #projCode#, '%') PROJ_CODE like CONCAT('%', #projCode#, '%')
......
src/main/java/com/baosight/hpjx/hp/sc/tools/HPSCTools.java
...@@ -528,6 +528,15 @@ public class HPSCTools { ...@@ -528,6 +528,15 @@ public class HPSCTools {
return results.get(0); return results.get(0);
} }
public static HPSC006 getHPSC006(String prodOrderNo) {
AssertUtils.isEmpty(prodOrderNo, "生产订单号不能为空");
Map queryMap = new HashMap();
queryMap.put("productionOrderNo", prodOrderNo);
List<HPSC006> results = DaoBase.getInstance().query(HPSC006.QUERY2, queryMap);
AssertUtils.isNull(results, String.format("生产订单[%s]信息不存在", prodOrderNo));
return results.get(0);
}
} }
/** /**
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
...@@ -195,8 +195,8 @@ public class ServiceHPZL001 extends ServiceBase { ...@@ -195,8 +195,8 @@ public class ServiceHPZL001 extends ServiceBase {
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HPZL001 fZl001 = new HPZL001(); HPZL001 fZl001 = new HPZL001();
fZl001.fromMap(resultRows.get(i)); fZl001.fromMap(resultRows.get(i));
fZl001.setCheckUser(UserSession.getLoginName()); /* fZl001.setCheckUser(UserSession.getLoginName());
fZl001.setCheckUserName(UserSession.getLoginCName()); fZl001.setCheckUserName(UserSession.getLoginCName());*/
fZl001.setStatus(CommonConstant.YesNo.YES_1); fZl001.setStatus(CommonConstant.YesNo.YES_1);
DaoUtils.update(HPSqlConstant.HPZL001.DO_PROCESS, fZl001); DaoUtils.update(HPSqlConstant.HPZL001.DO_PROCESS, fZl001);
} }
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001B.java
...@@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation; ...@@ -4,6 +4,7 @@ import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.ProdOrderStatusEnum; import com.baosight.hpjx.common.ProdOrderStatusEnum;
import com.baosight.hpjx.core.constant.CommonConstant; 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.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC003; import com.baosight.hpjx.hp.kc.domain.HPKC003;
import com.baosight.hpjx.hp.kc.domain.HPKC004; import com.baosight.hpjx.hp.kc.domain.HPKC004;
...@@ -23,6 +24,7 @@ import com.baosight.hpjx.util.ObjectUtils; ...@@ -23,6 +24,7 @@ import com.baosight.hpjx.util.ObjectUtils;
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.ServiceEPBase; import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import com.baosight.iplat4j.ed.util.SequenceGenerator; import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -124,6 +126,8 @@ public class ServiceHPZL001B extends ServiceEPBase { ...@@ -124,6 +126,8 @@ public class ServiceHPZL001B extends ServiceEPBase {
newZl001.setProdOrderNo(dbSc005b.getProdOrderNo()); newZl001.setProdOrderNo(dbSc005b.getProdOrderNo());
newZl001.setProdTaskNo(dbSc005b.getProdTaskNo()); newZl001.setProdTaskNo(dbSc005b.getProdTaskNo());
newZl001.setDeleteFlag(CommonConstant.YesNo.NO_0); newZl001.setDeleteFlag(CommonConstant.YesNo.NO_0);
newZl001.setCheckUser(UserSession.getLoginName());
newZl001.setCheckUserName(UserSession.getLoginCName());
DaoUtils.insert(HPZL001.INSERT, newZl001); DaoUtils.insert(HPZL001.INSERT, newZl001);
} }
} catch (Exception e) { } catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL001.xml
...@@ -142,6 +142,8 @@ ...@@ -142,6 +142,8 @@
ORG_NAME, <!-- 生产组名称 --> ORG_NAME, <!-- 生产组名称 -->
POOR_TYPE, <!-- 不良品类 --> POOR_TYPE, <!-- 不良品类 -->
PROBLEM_DESC, <!-- 质量问题描述 --> PROBLEM_DESC, <!-- 质量问题描述 -->
CHECK_USER , <!-- 检查人 -->
CHECK_USER_NAME, <!-- 检查人名称 -->
STATUS, <!-- 单据状态 0未处理 1已处理 --> STATUS, <!-- 单据状态 0未处理 1已处理 -->
CREATED_BY, <!-- 创建人 --> CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 --> CREATED_NAME, <!-- 创建人名称 -->
...@@ -150,7 +152,7 @@ ...@@ -150,7 +152,7 @@
) VALUES ( ) VALUES (
#companyCode#, #depCode#, #receiptDate#, #checkNo#, #prodOrderNo#, #prodTaskNo#, #companyCode#, #depCode#, #receiptDate#, #checkNo#, #prodOrderNo#, #prodTaskNo#,
#projCode#, #projName#, #inventCode#, #inventName#, #subInventCode#, #subInventName#, #projCode#, #projName#, #inventCode#, #inventName#, #subInventCode#, #subInventName#,
#orgNo#, #orgName#, #poorType#, #problemDesc#, #status#, #orgNo#, #orgName#, #poorType#, #problemDesc#,#checkUser#,#checkUserName#, #status#,
#createdBy#, #createdName#, #createdTime#, #deleteFlag#) #createdBy#, #createdName#, #createdTime#, #deleteFlag#)
</insert> </insert>
......
src/main/java/com/baosight/hpjx/util/ExcelUtils.java
...@@ -264,12 +264,14 @@ public class ExcelUtils { ...@@ -264,12 +264,14 @@ public class ExcelUtils {
HPSC002.fromMap((Map) arrayList.get(i)); HPSC002.fromMap((Map) arrayList.get(i));
//层级2 //层级2
if (HPSC002.getLv() == 2 && HPSC002.getPrdtType() != 4) { if (HPSC002.getLv() == 2 && HPSC002.getPrdtType() != 4) {
sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误，当前层级只能导入部件清单！！"); sb.append("导入失败:数据错误第"+(i+1)+"条,层级关系错误，当前层级只能导入部件清单！！");
checkStatus = true; checkStatus = true;
} else if (HPSC002.getLv() == 3 && (HPSC002.getPrdtType() != 3 || HPSC002.getPrdtType() != 5)) { } else if (HPSC002.getLv() == 3) {
sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误，当前层级只能导入零件或耗材清单！！"); if (!(HPSC002.getPrdtType() == 3 || HPSC002.getPrdtType() == 2)) {
sb.append("导入失败:数据错误第"+(i+1)+"条,层级关系错误，当前层级只能导入零件或耗材清单！！");
checkStatus = true; checkStatus = true;
} }
}
//完善数据 //完善数据
HPSC002.setLeaf("1"); HPSC002.setLeaf("1");
// 计算总重 // 计算总重
......
src/main/webapp/HP/KC/HPKC003A.jsp
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" required="true"> columnTemplate="#=textField#" itemTemplate="#=textField#" required="true">
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="applyNum" cname="入库数量" width="120" align="right" format="{0:N3}" required="true"/> <EF:EFColumn ename="applyNum" cname="入库数量" width="120" align="right" format="{0:N3}" required="true"/>
<EF:EFColumn ename="completeNum" cname="已入库数量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="completeNum" cname="已入库数量" enable="false" width="120" align="right" format="{0:N3}" hidden="true"/>
<EF:EFColumn ename="unCompleteNum" cname="待入库数量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="num" cname="任务数量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="num" cname="任务数量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="totalWt" cname="任务重量" enable="false" width="120" align="right" format="{0:N3}"/> <EF:EFColumn ename="totalWt" cname="任务重量" enable="false" width="120" align="right" format="{0:N3}"/>
<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="150" align="center"/> <EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="150" align="center"/>
......
src/main/webapp/HP/PZ/HPPZ002.jsp
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/> <EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput ename="inqu_status-0-custName" cname="供应商名称" colWidth="3" readonly="false"/> <EF:EFInput ename="inqu_status-0-custName" cname="供应商名称" colWidth="3" readonly="false"/>
<EF:EFInput ename="inqu_status-0-companyName" cname="公司" colWidth="3" readonly="false"/>
<EF:EFInput ename="inqu_status-0-headName" cname="负责人" colWidth="3" readonly="false"/>
</div>
<div class="row">
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3"> <EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
...@@ -28,6 +32,9 @@ ...@@ -28,6 +32,9 @@
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/> <EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/> <EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/>
<EF:EFColumn ename="companyName" cname="公司" width="100" required="true"/>
<EF:EFColumn ename="headName" cname="负责人" width="100" required="true"/>
<EF:EFColumn ename="phoneName" cname="负责人联系方式" width="100" required="true"/>
<EF:EFColumn ename="address" cname="地址" width="120" required="true"/> <EF:EFColumn ename="address" cname="地址" width="120" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true"> <EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
......
src/main/webapp/HP/PZ/HPPZ003.jsp
...@@ -12,11 +12,15 @@ ...@@ -12,11 +12,15 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/> <EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput ename="inqu_status-0-companyName" cname="公司" colWidth="3" readonly="false"/>
<EF:EFInput ename="inqu_status-0-headName" cname="负责人" colWidth="3" readonly="false"/>
<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3"> <EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFSelect> </EF:EFSelect>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result" title="记录集"> <EF:EFRegion id="result" title="记录集">
...@@ -27,7 +31,11 @@ ...@@ -27,7 +31,11 @@
<EF:EFCodeOption codeName="hpjx.hppz.companyType"/> <EF:EFCodeOption codeName="hpjx.hppz.companyType"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="custName" cname="客户名称" width="120" align="center" required="true"/> <EF:EFColumn ename="custName" cname="客户名称" width="120" align="center" required="true"/>
<EF:EFColumn ename="companyName" cname="公司" width="100" required="true"/>
<EF:EFColumn ename="headName" cname="负责人" width="100" required="true"/>
<EF:EFColumn ename="phoneName" cname="负责人联系方式" width="100" required="true"/>
<EF:EFColumn ename="address" cname="地址" width="150" align="center" required="true"/> <EF:EFColumn ename="address" cname="地址" width="150" align="center" required="true"/>
<EF:EFColumn ename="phoneName" cname="负责人联系方式" width="100" required="true"/>
<EF:EFComboColumn ename="status" cname="状态" width="100" align="center" required="true"> <EF:EFComboColumn ename="status" cname="状态" width="100" align="center" required="true">
<EF:EFCodeOption codeName="hpjx.hpjx.status"/> <EF:EFCodeOption codeName="hpjx.hpjx.status"/>
</EF:EFComboColumn> </EF:EFComboColumn>
......
src/main/webapp/HP/SC/HPSC001.js
...@@ -4,6 +4,11 @@ $(function () { ...@@ -4,6 +4,11 @@ $(function () {
resultGrid.dataSource.page(1); resultGrid.dataSource.page(1);
}); });
$("#DELETE").on("click", function () {
alert(1);
return false;
});
IPLATUI.EFGrid.result = { IPLATUI.EFGrid.result = {
...@@ -29,6 +34,24 @@ $(function () { ...@@ -29,6 +34,24 @@ $(function () {
} }
} }
], ],
onSave: function (e) {
// 阻止默认请求，使用自定义保存
e.preventDefault();
saveFunc();
},
onDelete: function (e) {
// 阻止默认请求，使用自定义删除
e.preventDefault();
deleteFunc();
},
onSuccess: function (e) {
if(e.eiInfo.extAttr.methodName == 'update'
||e.eiInfo.extAttr.methodName == 'insert'
||e.eiInfo.extAttr.methodName == 'delete' ){
query();
}
}
} }
}); });
...@@ -38,7 +61,8 @@ function check(id, auditStatus) { ...@@ -38,7 +61,8 @@ function check(id, auditStatus) {
inEiInfo.set("result-0-status", auditStatus); inEiInfo.set("result-0-status", auditStatus);
EiCommunicator.send('HPSC001', 'check', inEiInfo, { EiCommunicator.send('HPSC001', 'check', inEiInfo, {
onSuccess(response) { onSuccess(response) {
NotificationUtil(response.msg); //NotificationUtil(response.msg);
message("提交成功，已生成项目档案");
resultGrid.dataSource.page(1); resultGrid.dataSource.page(1);
}, },
onFail(errorMessage, status, e) { onFail(errorMessage, status, e) {
...@@ -50,3 +74,79 @@ function check(id, auditStatus) { ...@@ -50,3 +74,79 @@ function check(id, auditStatus) {
} }
); );
} }
/**
* 保存
*/
function saveFunc() {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
let flag = true;
$.each(rows, function(index, item) {
let projType= item.get("projType");
let projName= item.get("projName");
let princ1= item.get("princ1");
let princ2= item.get("princ2");
if(projType===""){
message("选中的第"+(index+1)+"行\"项目类型\"，不能为空!");
flag = false;
return false;
}
if(projName===""){
message("选中的第"+(index+1)+"行\"项目名称\"，不能为空!");
flag = false;
return false;
}
if(princ1===""){
message("选中的第"+(index+1)+"行\"项目负责人\"，不能为空!");
flag = false;
return false;
}
if(princ2===""){
message("选中的第"+(index+1)+"行\"客户负责人\"，不能为空!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPSC001", "insert", true);
}
});
}
}
/**
* 删除
*/
function deleteFunc() {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
let flag = true;
$.each(rows, function(index, item) {
let status= item.get("status");
if(status==="1"){
message("选中的第"+(index+1)+"行记录已提交，不能删除!");
flag = false;
return false;
}
});
if(flag){
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPSC001", "delete", true);
}
});
}
}
function query() {
resultGrid.dataSource.page(1);
}
src/main/webapp/HP/SC/HPSC002.js
...@@ -78,8 +78,8 @@ $(function () { ...@@ -78,8 +78,8 @@ $(function () {
IPLATUI.EFGrid = { IPLATUI.EFGrid = {
result: { result: {
pageable: { pageable: {
pageSize: 10, pageSize: 20,
pageSizes: [10, 20, 50, 100,200], pageSizes: [10, 20, 50, 70, 100],
}, },
loadComplete: function (grid) { // 在Grid加载完成后，才能给Grid上的按钮绑定事件 loadComplete: function (grid) { // 在Grid加载完成后，才能给Grid上的按钮绑定事件
$("#SC02").on("click", function () { $("#SC02").on("click", function () {
...@@ -407,6 +407,8 @@ $(function () { ...@@ -407,6 +407,8 @@ $(function () {
NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error"); NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
} else { } else {
NotificationUtil(ei.msg); NotificationUtil(ei.msg);
var tree = $("#materialTree").data("kendoTreeView");
setTimeout(function(){ tree.reload("root");}, 500);//更新树
query(); query();
} }
}, },
......
src/main/webapp/HP/SC/HPSC002A.js
...@@ -66,6 +66,7 @@ function uploadFileCallback(docId) { ...@@ -66,6 +66,7 @@ function uploadFileCallback(docId) {
let inEiInfo = new EiInfo(); let inEiInfo = new EiInfo();
inEiInfo.set("result-0-matId", $("#inqu_status-0-matId").val()); inEiInfo.set("result-0-matId", $("#inqu_status-0-matId").val());
inEiInfo.set("result-0-docId", docId); inEiInfo.set("result-0-docId", docId);
inEiInfo.set("result-0-bizType", $("#inqu_status-0-bizType").val());
EiCommunicator.send('HPSC002A', 'insert', inEiInfo, { EiCommunicator.send('HPSC002A', 'insert', inEiInfo, {
onSuccess(response) { onSuccess(response) {
resultGrid.dataSource.page(1); resultGrid.dataSource.page(1);
......
src/main/webapp/HP/SC/HPSC002A.jsp
...@@ -8,13 +8,9 @@ ...@@ -8,13 +8,9 @@
<EF:EFPage title="附件清单"> <EF:EFPage title="附件清单">
<EF:EFRegion id="inqu" title="查询区域" type="query"> <EF:EFRegion id="inqu" title="查询区域" type="query">
<EF:EFInput cname="物料ID" ename="matId" blockId="inqu_status" row="0" type="hidden"/> <EF:EFInput cname="物料ID" ename="matId" blockId="inqu_status" row="0" type="hidden"/>
<EF:EFInput cname="业务类型" ename="bizType" blockId="inqu_status" row="0" type="hidden"/>
<div class="row"> <div class="row">
<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/> <EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
......
src/main/webapp/HP/SC/HPSC002B.jsp
...@@ -9,13 +9,7 @@ ...@@ -9,13 +9,7 @@
<EF:EFRegion id="inqu" title="查询区域" type="query"> <EF:EFRegion id="inqu" title="查询区域" type="query">
<EF:EFInput cname="物料ID" ename="matId" blockId="inqu_status" row="0" type="hidden"/> <EF:EFInput cname="物料ID" ename="matId" blockId="inqu_status" row="0" type="hidden"/>
<div class="row"> <div class="row">
<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/> <EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3"/>
<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
......
src/main/webapp/HP/SC/HPSC003.jsp
...@@ -12,10 +12,10 @@ ...@@ -12,10 +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"/>
</div>
<div class="row">
<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" readonly="true"/>
</div>
<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="全部">
<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/HPSC005C.jsp
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-actualCompletionTotalWt" 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:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" disabled="true" />
<EF:EFInput ename="detail-0-actualCompletionDate" cname="实际完成时间" colWidth="4" readonly="true"/> <EF:EFDatePicker ename="detail-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" disabled="true" />
</div> </div>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
src/main/webapp/HP/SC/HPSC006.jsp
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
<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 enable="false" ename="planCompletionDate" cname="计划完成日期"/> <EF:EFColumn enable="false" ename="planCompletionDate" editType="date" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"
cname="计划完成日期"/>
<EF:EFColumn ename="operator" cname="操作" width="100" enable="false" readonly="false"/> <EF:EFColumn ename="operator" cname="操作" width="100" enable="false" readonly="false"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
...@@ -67,9 +68,10 @@ ...@@ -67,9 +68,10 @@
<EF:EFColumn ename="num" width="80" cname="数量"/> <EF:EFColumn ename="num" width="80" cname="数量"/>
<EF:EFColumn ename="unitWt" format="{0:N3}" width="80" cname="单重"/> <EF:EFColumn ename="unitWt" format="{0:N3}" width="80" cname="单重"/>
<EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" cname="总重"/> <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" cname="总重"/>
<EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date" dateFormat="yyyy/MM/dd" width="120"/> <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date"
<EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="120" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120"/>
enable="false"/> <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120" enable="false"/>
<EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" width="100" readonly="true"/> <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" width="100" readonly="true"/>
<EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量" width="100" readonly="true"/> <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量" width="100" readonly="true"/>
<EF:EFComboColumn enable="false" align="center" ename="status" width="80" cname="状态"> <EF:EFComboColumn enable="false" align="center" ename="status" width="80" cname="状态">
......
src/main/webapp/HP/SC/HPSC006A.js 0 → 100644
$(function () {
IPLATUI.EFGrid = {
"result" : {
pageable: {
pageSize: 15,
pageSizes: [15, 50, 70, 100],
},
columns: [{
field: "operator",
template: function (item) {
let prodOrderNo = item.productionOrderNo;
let template = '';
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="tearDetails(\'' + prodOrderNo + '\')" >查看详情</a>';
return template
}
}]
}
}
// 查询
$("#QUERY").on("click", query);
});
/**
* 页面加载时执行
*/
/*$(window).load(function () {
// 查询
query();
});*/
/**
* 查询
*/
function query() {
resultGrid.dataSource.page(1);
}
//厂区组类型下拉联动
$('input[name="inqu_status-0-factoryCode"]').change(function () {
var inInfo=new EiInfo();
var factoryCode=$("#inqu_status-0-factoryCode").val();
inInfo.set("factoryCode",factoryCode);
EiCommunicator.send("HPPZ011", "queryGroupComboBox", inInfo, {
onSuccess: function (ei) {
var input=$("#inqu_status-0-orgNo");
dataEdition=ei.getBlock("group_record_block_id").getMappedRows();
input.kendoDropDownList({
valuePrimitive: true,
dataTextField: "textField",
dataValueField: "valueField",
optionLabel:"请选择",
dataSource: dataEdition,
template: "#=textField#"
});
}, onFail: function (ei) {
}
}, {async: false});
});
/**
* 生产任务详情
*
* @param prodOrderNo
*/
function tearDetails(prodTaskNo) {
JSColorbox.open({
href: "HPSC006B?methodName=initLoad&inqu_status-0-prodOrderNo=" + prodTaskNo,
title: "<div style='text-align: center;'>下料订单详情</div>",
width: "80%",
height: "90%"
});
}
src/main/webapp/HP/SC/HPSC006A.jsp 0 → 100644
<!DOCTYPE html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage title="下料清单">
<EF:EFRegion id="inqu" title="查询条件">
<EF:EFInput cname="生产订单号" ename="productionOrderNo" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
<div class="row">
<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
<EF:EFSelect cname="厂区" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect cname="生产组" ename="orgNo" blockId="inqu_status" row="0" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect ename="status" blockId="inqu_status" cname="状态" colWidth="3">
<EF:EFOption label="全部" value=""/>
<EF:EFOption label="计划中" value="0"/>
<EF:EFOption label="生产中" value="1"/>
<EF:EFOption label="已完成" value="2"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" format="yyyy-MM-dd" colWidth="3" />
</div>
</EF:EFRegion>
<EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="override">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
<EF:EFColumn ename="productionOrderNo" cname="生产订单号" enable="false" width="150" align="center" hidden="true"/>
<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="prdtName" 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="orgName" cname="生产组名称" enable="false" width="100" align="center"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center"
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:EFComboColumn enable="false" align="center" ename="status" width="80" cname="状态">
<EF:EFOption label="计划中" value="0"/>
<EF:EFOption label="生产中" value="1"/>
<EF:EFOption label="已完成" value="2"/>
</EF:EFComboColumn>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/SC/HPSC006B.js 0 → 100644
let factoryGroupGlobalData = [];
$(function () {
IPLATUI.EFGrid = {
"result" : {
pageable: {
pageSize: 20,
pageSizes: [10, 20, 50, 70, 100],
},
columns: [{
field: "orgName",
attributes: {
class: "i-input-readonly"
}
}, {
field: "orgNo",
template: function (dataItem) {
for (let i = 0; i < factoryGroupGlobalData.length; i++) {
if (factoryGroupGlobalData[i]['valueField'] === dataItem['orgNo']) {
return factoryGroupGlobalData[i]['textField'];
}
}
return "";
},
editor: function (container, options) {
let inInfo = new EiInfo();
inInfo.set("inqu_status-0-factoryCode", options.model["factoryCode"]);
// 1:生产组
inInfo.set("inqu_status-0-groupType", 1);
inInfo.set("serviceName", "HPPZ011");
inInfo.set("methodName", "queryGroupComboBox");
inInfo.set("blockId", "group_record_block_id");
inInfo.set("field", options.field);
refreshSelect(container, inInfo);
}
}],
onSave: function (e) {
// 阻止后台保存请求，使用自定义保存
e.preventDefault();
save();
},
onDelete: function (e) {
// 阻止后台删除请求，使用自定义删除
e.preventDefault();
deleteFunc();
}
}
}
$("#QUERY").on("click", query);
});
/**
* 页面加载时执行
*/
$(window).load(function () {
// 生产组名称
let inInfo = new EiInfo();
inInfo.set("inqu_status-0-groupType", 1);
EiCommunicator.send("HPPZ011", "queryGroupComboBox", inInfo, {
onSuccess: function (ei) {
factoryGroupGlobalData = ei.getBlock("group_record_block_id").getMappedRows();
},
onFail: function (ei) {
}
}, {async: false});
// 查询
query();
});
/**
* 查询
*/
function query() {
resultGrid.dataSource.page(1);
}
/**
* 保存
*/
let save = function () {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPSC005A", "save", true);
}
});
}
/**
* 删除
*/
let deleteFunc = function () {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPSC005A", "delete", true);
}
});
}
src/main/webapp/HP/SC/HPSC006B.jsp 0 → 100644
<!DOCTYPE html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage title="下料详情">
<EF:EFRegion id="inqu" title="下料详情">
<EF:EFInput ename="inqu_status-0-prodOrderNo" cname="项目号" type="hidden"/>
<div class="row">
<EF:EFInput ename="detail-0-productionOrderNo" cname="项目号" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-productionOrderNo" cname="生产订单号" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-inventName" cname="材料名称" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="detail-0-inventLength" cname="长" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-inventWidth" cname="宽" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-inventThick" cname="厚" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="detail-0-material" cname="材质" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-totalWt" cname="总量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="detail-0-cutSchedule" cname="下料进度" format="{0:N2}" colWidth="4" readonly="true"/>
<EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true">
<EF:EFOption label="计划中" value="0"/>
<EF:EFOption label="生产中" value="1"/>
<EF:EFOption label="已完成" value="2"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/SC/HPSC007.jsp
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<EF:EFPage title="下料登记"> <EF:EFPage title="下料登记">
<EF:EFRegion id="inqu" title="订单详情"> <EF:EFRegion id="inqu" title="订单详情">
<EF:EFInput ename="detail-0-id" type="hidden"/>
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-projCode" cname="项目号" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-projCode" cname="项目号" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-projName" cname="项目名称" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-projName" cname="项目名称" colWidth="4" readonly="true"/>
...@@ -16,6 +17,7 @@ ...@@ -16,6 +17,7 @@
<EF:EFInput ename="detail-0-partName" cname="零件名称" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-partName" cname="零件名称" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-partName" cname="零部件名称" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-inventName" cname="材料名称" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-inventName" 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"/>
</div> </div>
...@@ -28,20 +30,33 @@ ...@@ -28,20 +30,33 @@
<EF:EFInput ename="detail-0-actualCompletionUnitWt" cname="完工重量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-actualCompletionUnitWt" cname="完工重量" colWidth="4" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完工重量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-planCompletionDate" cname="计划完成日期" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-planCompletionDate" 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"/>
<EF:EFOption label="完工" value="1"/> <EF:EFOption label="生产中" value="1"/>
<EF:EFOption label="已完成" value="2"/>
</EF:EFSelect> </EF:EFSelect>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result" title="明细信息"> <EF:EFRegion id="result" title="明细信息">
<EF:EFInput ename="productionOrderNo" type="hidden"/>
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row"> <EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="actualCompletionDate" required='true' cname="完成日期" editType="date" dateFormat="yyyy/MM/dd" />
<EF:EFPopupColumn ename="userId" cname="完成人" popupType="ServiceGrid"
popupTitle="人员信息" serviceName="HPXSUser" methodName="queryComboBox" resultId="user_block_id"
columnEnames="textField,valueField"
columnCnames="登录名称,用户名"
backFillColumnIds="textField,valueField"
backFillFieldIds="userName,userId"
valueField="valueField" textField="valueField"/>
<EF:EFColumn ename="userName" cname="完成名称" hidden="true"/>
<EF:EFColumn ename="actualCompletionDate" cname="完成日期" enable="false" hidden="true"/> <EF:EFColumn ename="actualCompletionDate" cname="完成日期" enable="false" hidden="true"/>
<EF:EFColumn ename="userId" cname="完成人" enable="false" align="center"/>
<EF:EFColumn ename="actualCompletionNum" cname="完成数量" format="{0:N3}" /> <EF:EFColumn ename="actualCompletionNum" cname="完成数量" format="{0:N3}" />
<EF:EFColumn ename="totalWt" cname="分派重量" enable="false" format="{0:N3}"/> <EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量" enable="false" format="{0:N3}"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
src/main/webapp/HP/ZL/HPZL001.js
...@@ -135,7 +135,12 @@ $(function () { ...@@ -135,7 +135,12 @@ $(function () {
template: function (options) { template: function (options) {
return showUserName(options.createdBy, options.createdName); return showUserName(options.createdBy, options.createdName);
} }
}] }],
onDelete: function (e) {
// 阻止默认请求，使用自定义删除
e.preventDefault();
deleteFunc();
}
} }
} }
...@@ -246,3 +251,30 @@ let selectStockCallback = function () { ...@@ -246,3 +251,30 @@ let selectStockCallback = function () {
// 关闭弹窗 // 关闭弹窗
JSColorbox.close(); JSColorbox.close();
} }
/**
* 删除
*/
function deleteFunc() {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
let flag = true;
$.each(rows, function(index, item) {
let status= item.get("status");
if(status==="1"){
message("选中的第"+(index+1)+"行记录已处理，不能删除!");
flag = false;
return false;
}
});
if(flag){
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPZL001", "delete", true);
}
});
}
}
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