Skip to content

H
hp-smart
Commit e6608058 by wuwenlong
Options

审核更名为提交； 

反审更名为撤回；
parent 1c175828
Showing with 134 additions and 134 deletions
src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC005.java
......@@ -40,7 +40,7 @@ public class HPKC005 extends DaoEPBase {
public static final String FIELD_DIFF_AMOUNT = "diffAmount"; /* 差异数量*/
public static final String FIELD_DIFF_WEIGHT = "diffWeight"; /* 差异重量*/
public static final String FIELD_KC_ID = "kcId"; /* 库存ID*/
public static final String FIELD_STATUS = "status"; /* 单据状态 0待审核 1已审核*/
public static final String FIELD_STATUS = "status"; /* 单据状态 0待提交 1已提交*/
public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_OLD_CHECK_NO = "oldCheckNo"; /* 原盘点单号*/
public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/
......@@ -69,7 +69,7 @@ public class HPKC005 extends DaoEPBase {
public static final String COL_DIFF_AMOUNT = "DIFF_AMOUNT"; /* 差异数量*/
public static final String COL_DIFF_WEIGHT = "DIFF_WEIGHT"; /* 差异重量*/
public static final String COL_KC_ID = "KC_ID"; /* 库存ID*/
public static final String COL_STATUS = "STATUS"; /* 单据状态 0待审核 1已审核*/
public static final String COL_STATUS = "STATUS"; /* 单据状态 0待提交 1已提交*/
public static final String COL_REMARK = "REMARK"; /* 备注*/
public static final String COL_OLD_CHECK_NO = "OLD_CHECK_NO"; /* 原盘点单号*/
public static final String COL_CREATED_BY = "CREATED_BY"; /* 创建人*/
......@@ -104,7 +104,7 @@ public class HPKC005 extends DaoEPBase {
private BigDecimal diffAmount = new BigDecimal(0.00); /* 差异数量*/
private BigDecimal diffWeight = new BigDecimal(0.00); /* 差异重量*/
private Long kcId = null; /* 库存ID*/
private Integer status = new Integer(0); /* 单据状态 0待审核 1已审核*/
private Integer status = new Integer(0); /* 单据状态 0待提交 1已提交*/
private String remark = " "; /* 备注*/
private String oldCheckNo = " "; /* 原盘点单号*/
private String createdBy = " "; /* 创建人*/
......@@ -213,7 +213,7 @@ public class HPKC005 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("单据状态 0待审核 1已审核");
eiColumn.setDescName("单据状态 0待提交 1已提交");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMARK);
......@@ -551,7 +551,7 @@ public class HPKC005 extends DaoEPBase {
this.kcId = kcId;
}
/**
* get the status - 单据状态 0待审核 1已审核.
* get the status - 单据状态 0待提交 1已提交.
* @return the status
*/
public Integer getStatus() {
......@@ -559,9 +559,9 @@ public class HPKC005 extends DaoEPBase {
}
/**
* set the status - 单据状态 0待审核 1已审核.
* set the status - 单据状态 0待提交 1已提交.
*
* @param status - 单据状态 0待审核 1已审核
* @param status - 单据状态 0待提交 1已提交
*/
public void setStatus(Integer status) {
this.status = status;
......
src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC006.java
......@@ -35,7 +35,7 @@ public class HPKC006 extends DaoEPBase {
public static final String FIELD_INVENT_RECORD_ID = "inventRecordId"; /* 规格*/
public static final String FIELD_AMOUNT = "amount"; /* 数量*/
public static final String FIELD_WEIGHT = "weight"; /* 重量*/
public static final String FIELD_STATUS = "status"; /* 状态 0审核 1保存*/
public static final String FIELD_STATUS = "status"; /* 状态 0提交 1保存*/
public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_OLD_ENTER_NO = "oldEnterNo"; /* 原入库单号*/
public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/
......@@ -59,7 +59,7 @@ public class HPKC006 extends DaoEPBase {
public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID"; /* 规格*/
public static final String COL_AMOUNT = "AMOUNT"; /* 数量*/
public static final String COL_WEIGHT = "WEIGHT"; /* 重量*/
public static final String COL_STATUS = "STATUS"; /* 状态 0审核 1保存*/
public static final String COL_STATUS = "STATUS"; /* 状态 0提交 1保存*/
public static final String COL_REMARK = "REMARK"; /* 备注*/
public static final String COL_OLD_ENTER_NO = "OLD_ENTER_NO"; /* 原入库单号*/
public static final String COL_CREATED_BY = "CREATED_BY"; /* 创建人*/
......@@ -89,7 +89,7 @@ public class HPKC006 extends DaoEPBase {
private Long inventRecordId = null; /* 规格*/
private BigDecimal amount = new BigDecimal(0.00); /* 数量*/
private BigDecimal weight = new BigDecimal(0.00); /* 重量*/
private Integer status = new Integer(0); /* 状态 0审核 1保存*/
private Integer status = new Integer(0); /* 状态 0提交 1保存*/
private String remark = " "; /* 备注*/
private String oldEnterNo = " "; /* 原入库单号*/
private String createdBy = " "; /* 创建人*/
......@@ -166,7 +166,7 @@ public class HPKC006 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态 0审核 1保存");
eiColumn.setDescName("状态 0提交 1保存");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMARK);
......@@ -424,7 +424,7 @@ public class HPKC006 extends DaoEPBase {
this.weight = weight;
}
/**
* get the status - 状态 0审核 1保存.
* get the status - 状态 0提交 1保存.
* @return the status
*/
public Integer getStatus() {
......@@ -432,9 +432,9 @@ public class HPKC006 extends DaoEPBase {
}
/**
* set the status - 状态 0审核 1保存.
* set the status - 状态 0提交 1保存.
*
* @param status - 状态 0审核 1保存
* @param status - 状态 0提交 1保存
*/
public void setStatus(Integer status) {
this.status = status;
......
src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC007.java
......@@ -35,7 +35,7 @@ public class HPKC007 extends DaoEPBase {
public static final String FIELD_INVENT_RECORD_ID = "inventRecordId"; /* 规格ID*/
public static final String FIELD_AMOUNT = "amount"; /* 数量*/
public static final String FIELD_WEIGHT = "weight"; /* 重量*/
public static final String FIELD_STATUS = "status"; /* 状态 0审核 1保存*/
public static final String FIELD_STATUS = "status"; /* 状态 0提交 1保存*/
public static final String FIELD_KC_ID = "kcId"; /* 库存ID*/
public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_OLD_OUTER_NO = "oldOuterNo"; /* 原出库单号*/
......@@ -60,7 +60,7 @@ public class HPKC007 extends DaoEPBase {
public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID"; /* 规格ID*/
public static final String COL_AMOUNT = "AMOUNT"; /* 数量*/
public static final String COL_WEIGHT = "WEIGHT"; /* 重量*/
public static final String COL_STATUS = "STATUS"; /* 状态 0审核 1保存*/
public static final String COL_STATUS = "STATUS"; /* 状态 0提交 1保存*/
public static final String COL_KC_ID = "KC_ID"; /* 库存ID*/
public static final String COL_REMARK = "REMARK"; /* 备注*/
public static final String COL_OLD_OUTER_NO = "OLD_OUTER_NO"; /* 原出库单号*/
......@@ -91,7 +91,7 @@ public class HPKC007 extends DaoEPBase {
private Long inventRecordId = null; /* 规格ID*/
private BigDecimal amount = new BigDecimal(0.00); /* 数量*/
private BigDecimal weight = new BigDecimal(0.00); /* 重量*/
private Integer status = 0; /* 状态 0审核 1保存*/
private Integer status = 0; /* 状态 0提交 1保存*/
private Long kcId = null; /* 库存ID*/
private String remark = " "; /* 备注*/
private String oldOuterNo = " "; /* 原出库单号*/
......@@ -169,7 +169,7 @@ public class HPKC007 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态 0审核 1保存");
eiColumn.setDescName("状态 0提交 1保存");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_KC_ID);
......@@ -431,7 +431,7 @@ public class HPKC007 extends DaoEPBase {
this.weight = weight;
}
/**
* get the status - 状态 0审核 1保存.
* get the status - 状态 0提交 1保存.
* @return the status
*/
public Integer getStatus() {
......@@ -439,9 +439,9 @@ public class HPKC007 extends DaoEPBase {
}
/**
* set the status - 状态 0审核 1保存.
* set the status - 状态 0提交 1保存.
*
* @param status - 状态 0审核 1保存
* @param status - 状态 0提交 1保存
*/
public void setStatus(Integer status) {
this.status = status;
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC005.xml
......@@ -21,7 +21,7 @@
DIFF_AMOUNT as "diffAmount", <!-- 差异数量 -->
DIFF_WEIGHT as "diffWeight", <!-- 差异重量 -->
KC_ID as "kcId", <!-- 库存ID -->
STATUS as "status", <!-- 单据状态 0待审核 1已审核 -->
STATUS as "status", <!-- 单据状态 0待提交 1已提交 -->
REMARK as "remark", <!-- 备注 -->
OLD_CHECK_NO as "oldCheckNo", <!-- 原盘点单号 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml
......@@ -16,7 +16,7 @@
INVENT_RECORD_ID as "inventRecordId", <!-- 规格 -->
AMOUNT as "amount", <!-- 数量 -->
WEIGHT as "weight", <!-- 重量 -->
STATUS as "status", <!-- 状态 0审核 1保存 -->
STATUS as "status", <!-- 状态 0提交 1保存 -->
REMARK as "remark", <!-- 备注 -->
OLD_ENTER_NO as "oldEnterNo", <!-- 原入库单号 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC007.xml
......@@ -16,7 +16,7 @@
INVENT_RECORD_ID as "inventRecordId", <!-- 规格 -->
AMOUNT as "amount", <!-- 数量 -->
WEIGHT as "weight", <!-- 重量 -->
STATUS as "status", <!-- 状态 0审核 1保存 -->
STATUS as "status", <!-- 状态 0提交 1保存 -->
KC_ID as "kcId", <!-- 库存ID -->
REMARK as "remark", <!-- 备注 -->
OLD_OUTER_NO as "oldOuterNo", <!-- 原出库单号 -->
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC001.java
......@@ -17,7 +17,7 @@ public class HPSC001 extends DaoEPBase {
private String projName = " "; /* 项目名称*/
private String princ1 = " "; /* 本公司项目负责人*/
private String princ2 = " "; /* 客户项目负责人*/
private Integer status = 0; /* 状态 0-未审核，1-已审核*/
private Integer status = 0; /* 状态 0-未提交，1-已提交*/
private String createdBy = " "; /* 创建人*/
private String createdName = " "; /* 创建人名称*/
private String createdTime ; /* 创建时间*/
......@@ -27,7 +27,7 @@ public class HPSC001 extends DaoEPBase {
private String depCode = " "; /* 部门编码*/
private String remark = " "; /* 备注*/
private Integer materialStatus = 0; /* 物料审核状态0-未审核，1部分审核，2全部审核*/
private Integer materialStatus = 0; /* 物料提交状态0-未提交，1部分提交，2全部提交*/
/**
* initialize the metadata
*/
......@@ -64,7 +64,7 @@ public class HPSC001 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("status");
eiColumn.setDescName("状态 0-未审核，1-已审核");
eiColumn.setDescName("状态 0-未提交，1-已提交");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("createdBy");
......@@ -100,7 +100,7 @@ public class HPSC001 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("materialStatus");
eiColumn.setDescName("物料审核状态0-未审核，1部分审核，2全部审核");
eiColumn.setDescName("物料提交状态0-未提交，1部分提交，2全部提交");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -209,7 +209,7 @@ public class HPSC001 extends DaoEPBase {
this.princ2 = princ2;
}
/**
* get the status - 状态 0-未审核，1-已审核
* get the status - 状态 0-未提交，1-已提交
* @return the status
*/
public Integer getStatus() {
......@@ -217,7 +217,7 @@ public class HPSC001 extends DaoEPBase {
}
/**
* set the status - 状态 0-未审核，1-已审核
* set the status - 状态 0-未提交，1-已提交
*/
public void setStatus(Integer status) {
this.status = status;
......@@ -325,13 +325,13 @@ public class HPSC001 extends DaoEPBase {
this.remark = remark;
}
/**
* set the materialStatus - 物料审核状态0-未审核，1部分审核，2全部审核
* set the materialStatus - 物料提交状态0-未提交，1部分提交，2全部提交
*/
public void setMaterialStatus(Integer materialStatus) {
this.materialStatus = materialStatus;
}
/**
* get the materialStatus - 物料审核状态0-未审核，1部分审核，2全部审核
* get the materialStatus - 物料提交状态0-未提交，1部分提交，2全部提交
* @return the materialStatus
*/
public Integer getMaterialStatus() {
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC002.java
......@@ -45,7 +45,7 @@ public class HPSC002 extends DaoEPBase {
private String filePath3 = " "; /* 文件地址3*/
private String filePath4 = " "; /* 文件地址4*/
private String filePath5 = " "; /* 文件地址5*/
private Integer status = 0; /* 状态 0-未审核，1-已审核*/
private Integer status = 0; /* 状态 0-未提交，1-已提交*/
private Integer delStatus = 0; /* 状态 1未删除，0已删除*/
private String createdBy = " "; /* 创建人*/
private String createdTime; /* 创建时间*/
......@@ -160,7 +160,7 @@ public class HPSC002 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("status");
eiColumn.setDescName("状态 0-未审核，1-已审核");
eiColumn.setDescName("状态 0-未提交，1-已提交");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("delStatus");
......@@ -545,7 +545,7 @@ public class HPSC002 extends DaoEPBase {
}
/**
* get the status - 状态 0-未审核，1-已审核
* get the status - 状态 0-未提交，1-已提交
* @return the status
*/
public Integer getStatus() {
......@@ -553,7 +553,7 @@ public class HPSC002 extends DaoEPBase {
}
/**
* set the status - 状态 0-未审核，1-已审核
* set the status - 状态 0-未提交，1-已提交
*/
public void setStatus(Integer status) {
this.status = status;
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
......@@ -51,7 +51,7 @@ public class HPSC004 extends DaoEPBase {
public static final String FIELD_ACTUAL_COMPLETION_NUM = "actualCompletionNum"; /* 实际完工数量*/
public static final String FIELD_ACTUAL_COMPLETION_UNIT_WT = "actualCompletionUnitWt"; /* 实际完工重量*/
public static final String FIELD_PRODUCTION_ORDER_NO = "productionOrderNo"; /* 生产订单号*/
public static final String FIELD_STATUS = "status"; /* 状态 0-未审核，1-已审核*/
public static final String FIELD_STATUS = "status"; /* 状态 0-未提交，1-已提交*/
public static final String FIELD_DEL_STATUS = "delStatus"; /* 状态 1未删除，0已删除*/
public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/
public static final String FIELD_CREATED_TIME = "createdTime"; /* 创建时间*/
......@@ -89,7 +89,7 @@ public class HPSC004 extends DaoEPBase {
public static final String COL_ACTUAL_COMPLETION_NUM = "ACTUAL_COMPLETION_NUM"; /* 实际完工数量*/
public static final String COL_ACTUAL_COMPLETION_UNIT_WT = "ACTUAL_COMPLETION_UNIT_WT"; /* 实际完工重量*/
public static final String COL_PRODUCTION_ORDER_NO = "PRODUCTION_ORDER_NO"; /* 生产订单号*/
public static final String COL_STATUS = "STATUS"; /* 状态 0-未审核，1-已审核*/
public static final String COL_STATUS = "STATUS"; /* 状态 0-未提交，1-已提交*/
public static final String COL_DEL_STATUS = "DEL_STATUS"; /* 状态 1未删除，0已删除*/
public static final String COL_CREATED_BY = "CREATED_BY"; /* 创建人*/
public static final String COL_CREATED_TIME = "CREATED_TIME"; /* 创建时间*/
......@@ -132,7 +132,7 @@ public class HPSC004 extends DaoEPBase {
private BigDecimal actualCompletionNum = new BigDecimal(0.000); /* 实际完工数量*/
private BigDecimal actualCompletionUnitWt = new BigDecimal(0.000); /* 实际完工重量*/
private String productionOrderNo = " "; /* 生产订单号*/
private Integer status = new Integer(0); /* 状态 0-未审核，1-已审核*/
private Integer status = new Integer(0); /* 状态 0-未提交，1-已提交*/
private Integer delStatus = new Integer(0); /* 状态 1未删除，0已删除*/
private String createdBy = " "; /* 创建人*/
private String createdTime ; /* 创建时间*/
......@@ -270,7 +270,7 @@ public class HPSC004 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态 0-未审核，1-已审核");
eiColumn.setDescName("状态 0-未提交，1-已提交");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEL_STATUS);
......@@ -759,7 +759,7 @@ public class HPSC004 extends DaoEPBase {
this.productionOrderNo = productionOrderNo;
}
/**
* get the status - 状态 0-未审核，1-已审核.
* get the status - 状态 0-未提交，1-已提交.
* @return the status
*/
public Integer getStatus() {
......@@ -767,9 +767,9 @@ public class HPSC004 extends DaoEPBase {
}
/**
* set the status - 状态 0-未审核，1-已审核.
* set the status - 状态 0-未提交，1-已提交.
*
* @param status - 状态 0-未审核，1-已审核
* @param status - 状态 0-未提交，1-已提交
*/
public void setStatus(Integer status) {
this.status = status;
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java
......@@ -134,7 +134,7 @@ public class ServiceHPSC001 extends ServiceBase {
/**
* 审核 反审.
* 提交 撤回.
*/
public EiInfo check(EiInfo eiInfo) {
HPSC001 hpsc001 = new HPSC001();
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
......@@ -240,7 +240,7 @@ public class ServiceHPSC002 extends ServiceBase {
/**
* 审核 反审.
* 提交 撤回.
*/
public EiInfo check(EiInfo eiInfo) {
HPSC002 hppz002 = new HPSC002();
......@@ -249,18 +249,18 @@ public class ServiceHPSC002 extends ServiceBase {
for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
hppz002.fromMap(map);
//限制一下，如果二级已经审核通过，这个时候不允许进行反审
//限制一下，如果二级已经提交通过，这个时候不允许进行撤回
if(map.get("status").equals("0")) {
//找到二级是否已经审核
//找到二级是否已经提交
HPSC002 THPSC002 = (HPSC002) dao.get("HPSC002.query","id",hppz002.getId());
if (THPSC002.getStatus() == 1) {
// 二级如果已经审核了则需要去看看计划是否已经更新
// 二级如果已经提交了则需要去看看计划是否已经更新
}
}
DaoUtils.update("HPSC002.check", hppz002.toMap());
}
// 处理三级审核之后判断是否都审核完成，如果都审核完成则二级直接审核通过
// 处理三级提交之后判断是否都提交完成，如果都提交完成则二级直接提交通过
for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
hppz002.fromMap(map);
......@@ -287,13 +287,13 @@ public class ServiceHPSC002 extends ServiceBase {
map3.put("projCode",THPSC002.getProjCode());
List list1 = dao.query("HPSC002.checkExamineNum1", map3);
List list2 = dao.query("HPSC002.checkExamineNum1Count", map3);
//未审核数量
//未提交数量
int num1 = NumberUtils.toint(list1.get(0));
//总量
int num2 = NumberUtils.toint(list2.get(0));
if (num1 == 0) {
//都已经审核
//都已经提交
Map map4 = new HashMap();
map4.put("projCode",THPSC002.getProjCode());
map4.put("materialStatus",2);
......@@ -309,13 +309,13 @@ public class ServiceHPSC002 extends ServiceBase {
}
} catch (PlatException e) {
eiInfo.setStatus(EiConstant.STATUS_FAILURE);
eiInfo.setMsg("审核失败，原因参见详细错误描述！");
eiInfo.setMsg("提交失败，原因参见详细错误描述！");
eiInfo.setDetailMsg(e.getMessage());
logError("审核失败！", e.getMessage());
logError("提交失败！", e.getMessage());
return eiInfo;
}
eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("审核成功！");
eiInfo.setMsg("提交成功！");
return eiInfo;
}
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java
......@@ -177,7 +177,7 @@ public class ServiceHPSC003 extends ServiceBase {
}
/**
* 审核生产计划
* 提交生产计划
* @param eiInfo
* @return
*/
......@@ -216,13 +216,13 @@ public class ServiceHPSC003 extends ServiceBase {
}
} catch (PlatException e) {
eiInfo.setStatus(EiConstant.STATUS_FAILURE);
eiInfo.setMsg("审核失败，原因参见详细错误描述！");
eiInfo.setMsg("提交失败，原因参见详细错误描述！");
eiInfo.setDetailMsg(e.getMessage());
logError("审核失败！", e.getMessage());
logError("提交失败！", e.getMessage());
return eiInfo;
}
eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("审核成功！");
eiInfo.setMsg("提交成功！");
return eiInfo;
}
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC004.java
......@@ -132,7 +132,7 @@ public class ServiceHPSC004 extends ServiceBase {
}
/**
* 计划审核验证
* 计划提交验证
* @param eiInfo
* @return
*/
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml
......@@ -30,7 +30,7 @@
PROJ_NAME as "projName", <!-- 项目名称 -->
PRINC1 as "princ1", <!-- 本公司项目负责人 -->
PRINC2 as "princ2", <!-- 客户项目负责人 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
......@@ -152,7 +152,7 @@
PROJ_NAME, <!-- 项目名称 -->
PRINC1, <!-- 本公司项目负责人 -->
PRINC2, <!-- 客户项目负责人 -->
STATUS, <!-- 状态 0-未审核，1-已审核 -->
STATUS, <!-- 状态 0-未提交，1-已提交 -->
MATERIAL_STATUS,
CREATED_BY, <!-- 创建人 -->
CREATED_TIME, <!-- 创建时间 -->
......@@ -177,7 +177,7 @@
PROJ_NAME = #projName#, <!-- 项目名称 -->
PRINC1 = #princ1#, <!-- 本公司项目负责人 -->
PRINC2 = #princ2#, <!-- 客户项目负责人 -->
STATUS = #status#, <!-- 状态 0-未审核，1-已审核 -->
STATUS = #status#, <!-- 状态 0-未提交，1-已提交 -->
MATERIAL_STATUS = #materialStatus#,
CREATED_BY = #createdBy#, <!-- 创建人 -->
CREATED_TIME = #createdTime#, <!-- 创建时间 -->
......@@ -222,7 +222,7 @@
PROJ_NAME as "projName", <!-- 项目名称 -->
PRINC1 as "princ1", <!-- 本公司项目负责人 -->
PRINC2 as "princ2", <!-- 客户项目负责人 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml
......@@ -61,7 +61,7 @@
FILE_PATH3 as "filePath3", <!-- 文件地址3 -->
FILE_PATH4 as "filePath4", <!-- 文件地址4 -->
FILE_PATH5 as "filePath5", <!-- 文件地址5 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
......@@ -252,7 +252,7 @@
FILE_PATH3, <!-- 文件地址3 -->
FILE_PATH4, <!-- 文件地址4 -->
FILE_PATH5, <!-- 文件地址5 -->
STATUS, <!-- 状态 0-未审核，1-已审核 -->
STATUS, <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS, <!-- 状态 1未删除，0已删除 -->
CREATED_BY, <!-- 创建人 -->
CREATED_TIME, <!-- 创建时间 -->
......@@ -294,7 +294,7 @@
FILE_PATH3 = #filePath3#, <!-- 文件地址3 -->
FILE_PATH4 = #filePath4#, <!-- 文件地址4 -->
FILE_PATH5 = #filePath5#, <!-- 文件地址5 -->
STATUS = #status#, <!-- 状态 0-未审核，1-已审核 -->
STATUS = #status#, <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS = #delStatus#, <!-- 状态 1未删除，0已删除 -->
CREATED_BY = #createdBy#, <!-- 创建人 -->
CREATED_TIME = #createdTime#, <!-- 创建时间 -->
......@@ -361,7 +361,7 @@
FILE_PATH3 as "filePath3", <!-- 文件地址3 -->
FILE_PATH4 as "filePath4", <!-- 文件地址4 -->
FILE_PATH5 as "filePath5", <!-- 文件地址5 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
......@@ -406,7 +406,7 @@
FILE_PATH3 as "filePath3", <!-- 文件地址3 -->
FILE_PATH4 as "filePath4", <!-- 文件地址4 -->
FILE_PATH5 as "filePath5", <!-- 文件地址5 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
......@@ -179,7 +179,7 @@
ACTUAL_COMPLETION_DATE as "actualCompletionDate", <!-- 实际完工日期 -->
ACTUAL_COMPLETION_NUM as "actualCompletionNum", <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT as "actualCompletionUnitWt", <!-- 实际完工重量 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
......@@ -335,7 +335,7 @@
ACTUAL_COMPLETION_DATE, <!-- 实际完工日期 -->
ACTUAL_COMPLETION_NUM, <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT, <!-- 实际完工重量 -->
STATUS, <!-- 状态 0-未审核，1-已审核 -->
STATUS, <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS, <!-- 状态 1未删除，0已删除 -->
CREATED_BY, <!-- 创建人 -->
CREATED_TIME, <!-- 创建时间 -->
......@@ -381,7 +381,7 @@
ACTUAL_COMPLETION_NUM = #actualCompletionNum#, <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#, <!-- 实际完工重量 -->
PRODUCTION_ORDER_NO = #productionOrderNo#, <!-- 生产订单号 -->
STATUS = #status#, <!-- 状态 0-未审核，1-已审核 -->
STATUS = #status#, <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS = #delStatus#, <!-- 状态 1未删除，0已删除 -->
CREATED_BY = #createdBy#, <!-- 创建人 -->
CREATED_TIME = #createdTime#, <!-- 创建时间 -->
......@@ -434,7 +434,7 @@
ACTUAL_COMPLETION_DATE as "actualCompletionDate", <!-- 实际完工日期 -->
ACTUAL_COMPLETION_NUM as "actualCompletionNum", <!-- 实际完工数量 -->
ACTUAL_COMPLETION_UNIT_WT as "actualCompletionUnitWt", <!-- 实际完工重量 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS as "delStatus", <!-- 状态 1未删除，0已删除 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC011.xml
......@@ -30,7 +30,7 @@
PROJ_NAME as "projName", <!-- 项目名称 -->
PRINC1 as "princ1", <!-- 本公司项目负责人 -->
PRINC2 as "princ2", <!-- 客户项目负责人 -->
STATUS as "status", <!-- 状态 0-未审核，1-已审核 -->
STATUS as "status", <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
......@@ -149,7 +149,7 @@
PROJ_NAME, <!-- 项目名称 -->
PRINC1, <!-- 本公司项目负责人 -->
PRINC2, <!-- 客户项目负责人 -->
STATUS, <!-- 状态 0-未审核，1-已审核 -->
STATUS, <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY, <!-- 创建人 -->
CREATED_TIME, <!-- 创建时间 -->
UPDATED_BY, <!-- 更新人 -->
......@@ -173,7 +173,7 @@
PROJ_NAME = #projName#, <!-- 项目名称 -->
PRINC1 = #princ1#, <!-- 本公司项目负责人 -->
PRINC2 = #princ2#, <!-- 客户项目负责人 -->
STATUS = #status#, <!-- 状态 0-未审核，1-已审核 -->
STATUS = #status#, <!-- 状态 0-未提交，1-已提交 -->
CREATED_BY = #createdBy#, <!-- 创建人 -->
CREATED_TIME = #createdTime#, <!-- 创建时间 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
......
src/main/java/com/baosight/hpjx/hp/zl/domain/HPZL001.java
......@@ -25,7 +25,7 @@ public class HPZL001 extends DaoEPBase {
private String unit = " "; /* 生产组*/
private String notes = " "; /* 质量问题描述*/
private String princ = " "; /* 检查人*/
private int status; /* 单据状态 0待审核 1已审核*/
private int status; /* 单据状态 0待提交 1已提交*/
private String affix = " "; /* 附件*/
private String createdBy = " "; /* 创建人*/
private String createdTime = " "; /* 创建时间*/
......@@ -76,7 +76,7 @@ EiColumn eiColumn;
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("status");
eiColumn.setDescName("单据状态 0待审核 1已审核");
eiColumn.setDescName("单据状态 0待提交 1已提交");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("affix");
......@@ -239,7 +239,7 @@ initMetaData();
this.princ = princ;
}
/**
* get the status - 单据状态 0待审核 1已审核
* get the status - 单据状态 0待提交 1已提交
* @return the status
*/
public int getStatus() {
......@@ -247,7 +247,7 @@ initMetaData();
}
/**
* set the status - 单据状态 0待审核 1已审核
* set the status - 单据状态 0待提交 1已提交
*/
public void setStatus(int status) {
this.status = status;
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
......@@ -140,7 +140,7 @@ public class ServiceHPZL001 extends ServiceBase {
}
/**
* 审核操作
* 提交操作
*
* @param inInfo
* @return
......@@ -156,15 +156,15 @@ public class ServiceHPZL001 extends ServiceBase {
}
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据审核成功!");
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据提交成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "审核失败");
LogUtils.setDetailMsg(inInfo, e, "提交失败");
}
return inInfo;
}
/**
* 反审操作
* 撤回操作
*
* @param inInfo
* @return
......@@ -180,9 +180,9 @@ public class ServiceHPZL001 extends ServiceBase {
}
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据反审成功!");
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据撤回成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "审核失败");
LogUtils.setDetailMsg(inInfo, e, "提交失败");
}
return inInfo;
}
......
src/main/java/com/baosight/hpjx/hp/zl/sql/HPZL001.xml
......@@ -13,7 +13,7 @@
UNIT as "unit", <!-- 生产组 -->
NOTES as "notes", <!-- 质量问题描述 -->
PRINC as "princ", <!-- 检查人 -->
STATUS as "status", <!-- 单据状态 0待审核 1已审核 -->
STATUS as "status", <!-- 单据状态 0待提交 1已提交 -->
AFFIX as "affix", <!-- 附件 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
......@@ -63,7 +63,7 @@
UNIT, <!-- 生产组 -->
NOTES, <!-- 质量问题描述 -->
PRINC, <!-- 检查人 -->
STATUS, <!-- 单据状态 0待审核 1已审核 -->
STATUS, <!-- 单据状态 0待提交 1已提交 -->
AFFIX, <!-- 附件 -->
CREATED_BY, <!-- 创建人 -->
CREATED_TIME <!-- 创建时间 -->
......@@ -87,18 +87,18 @@
UNIT = #unit#, <!-- 生产组 -->
NOTES = #notes#, <!-- 质量问题描述 -->
PRINC = #princ#, <!-- 检查人 -->
STATUS = #status#, <!-- 单据状态 0待审核 1已审核 -->
STATUS = #status#, <!-- 单据状态 0待提交 1已提交 -->
AFFIX = #affix#, <!-- 附件 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
WHERE ID = #id#
</update>
<!-- 审核操作 -->
<!-- 提交操作 -->
<update id="operator">
UPDATE hpjx.t_hpzl001
SET
STATUS = #status#, <!-- 单据状态 0待审核 1已审核 -->
STATUS = #status#, <!-- 单据状态 0待提交 1已提交 -->
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
WHERE ID = #id#
......
src/main/webapp/HP/SC/HPSC001.js
......@@ -19,11 +19,11 @@ $(function () {
let template = '';
if (auditStatus == 0) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
'onclick="check(' + item.id + ',1)" >审核</a>';
'onclick="check(' + item.id + ',1)" >提交</a>';
}
// else if (auditStatus == 1) {
// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
// 'onclick="check(' + item.id + ',0)" >反审</a>';
// 'onclick="check(' + item.id + ',0)" >撤回</a>';
// }
return template;
}
......
src/main/webapp/HP/SC/HPSC001.jsp
......@@ -20,8 +20,8 @@
<EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
<EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
<EF:EFSelect cname="单据状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
<EF:EFOption label="未审核" value="0"/>
<EF:EFOption label="已审核" value="1"/>
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="已提交" value="1"/>
</EF:EFSelect>
<EF:EFSelect cname="项目负责人" ename="inqu_status-0-princ1" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
......@@ -55,8 +55,8 @@
filter="contains">
</EF:EFComboColumn>
<EF:EFComboColumn enable="false" align="center" ename="status" cname="状态" readonly="true">
<EF:EFOption label="未审核" value="0"/>
<EF:EFOption label="已审核" value="1"/>
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="已提交" value="1"/>
</EF:EFComboColumn>
<EF:EFColumn ename="remark" cname="备注" readonly="true"/>
<EF:EFColumn ename="operator" cname="操作" width="100" enable="false" readonly="false"/>
......
src/main/webapp/HP/SC/HPSC002.js
......@@ -210,10 +210,10 @@ $(function () {
if (lv === '3') {
if (auditStatus == 0) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'onclick="check(' + item.id + ',1)" >审核</a>';
'onclick="check(' + item.id + ',1)" >提交</a>';
} else {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'onclick="check(' + item.id + ',0)" >反审</a>';
'onclick="check(' + item.id + ',0)" >撤回</a>';
}
}
return template;
......
src/main/webapp/HP/SC/HPSC002.jsp
......@@ -20,8 +20,8 @@
<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect cname="状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
<EF:EFOption label="未审核" value="0"/>
<EF:EFOption label="已审核" value="1"/>
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="已提交" value="1"/>
</EF:EFSelect>
</div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
......@@ -59,9 +59,9 @@
<EF:EFComboColumn enable="false" ename="status" align="center"
columnTemplate="#=textField#" optionLabel=" "
itemTemplate="#=textField#" textField="textField"
valueField="valueField" cname="审核状态">
<EF:EFOption label="未审核" value="0"></EF:EFOption>
<EF:EFOption label="已审核" value="1"></EF:EFOption>
valueField="valueField" cname="提交状态">
<EF:EFOption label="未提交" value="0"></EF:EFOption>
<EF:EFOption label="已提交" value="1"></EF:EFOption>
</EF:EFComboColumn>
<EF:EFColumn ename="operator" cname="操作" width="200" enable="false" readonly="false"/>
</EF:EFGrid>
......
src/main/webapp/HP/SC/HPSC003.js
......@@ -21,11 +21,11 @@ $(function () {
let template = '';
if (auditStatus == 0) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
'onclick="check(' + item.id + ',1)" >审核</a>';
'onclick="check(' + item.id + ',1)" >提交</a>';
}
else {
template += '<a hidden="hidden" style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
'onclick="check(' + item.id + ',0)" >反审</a>';
'onclick="check(' + item.id + ',0)" >撤回</a>';
}
return template;
}
......@@ -160,11 +160,11 @@ function check(id, auditStatus) {
onSuccess(ei) {
var model=ei.get("model");
if(!model.planCompletionDate) {
NotificationUtil("审核失败！原因：基本信息中计划完成日期未填写", "error");
NotificationUtil("提交失败！原因：基本信息中计划完成日期未填写", "error");
return;
} else {
//审核
//审核前先判断明细信息中的计划开始和计划结束时间是否都已经填写，只有填写了之后才能进行审核
//提交
//提交前先判断明细信息中的计划开始和计划结束时间是否都已经填写，只有填写了之后才能进行提交
if (auditStatus == 1) {
EiCommunicator.send('HPSC004', 'inspectDetail', inEiInfo, {
onSuccess(ei) {
......@@ -172,7 +172,7 @@ function check(id, auditStatus) {
if(list) {
var count = list[0];
if (count > 0) {
NotificationUtil("审核失败！原因：明细信息中有未填写的计划开始时间或计划结束时间", "error");
NotificationUtil("提交失败！原因：明细信息中有未填写的计划开始时间或计划结束时间", "error");
} else {
EiCommunicator.send('HPSC004','queryDetail',inEiInfo,{
onSuccess(ei){
......@@ -182,7 +182,7 @@ function check(id, auditStatus) {
NotificationUtil("计划结束时间应该大于计划开始时间！", "error");
}
else {
// 审核通过，生成
// 提交通过，生成
EiCommunicator.send('HPSC003', 'checkHPSC0003', inEiInfo, {
onSuccess(response) {
NotificationUtil(response.msg);
......@@ -204,7 +204,7 @@ function check(id, auditStatus) {
}
} else {
NotificationUtil("审核失败！未找到明细信息", "error");
NotificationUtil("提交失败！未找到明细信息", "error");
}
},
onFail(errorMessage, status, e) {
......@@ -216,7 +216,7 @@ function check(id, auditStatus) {
}
);
} else {
// 反审
// 撤回
}
}
......
src/main/webapp/HP/SC/HPSC003.jsp
......@@ -28,8 +28,8 @@
<EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" colWidth="3" cname="计划完成日期:"
format="yyyy-MM-dd"/>
<EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" colWidth="3" ename="status" >
<EF:EFOption label="未审核" value="0"/>
<EF:EFOption label="已审核" value="1"/>
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="已提交" value="1"/>
</EF:EFSelect>
</div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
......@@ -50,8 +50,8 @@
required='true' readonly="true"/>
<EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" readonly="true"/>
<EF:EFComboColumn enable="false" ename="status" cname="状态">
<EF:EFOption label="未审核" value="0"/>
<EF:EFOption label="已审核" value="1"/>
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="已提交" value="1"/>
</EF:EFComboColumn>
<EF:EFColumn ename="operator" cname="操作" width="100" enable="false" readonly="false"/>
</EF:EFGrid>
......
src/main/webapp/HP/SC/HPSC011.jsp
......@@ -23,10 +23,10 @@
</EF:EFSelect>
<EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
<EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
<EF:EFSelect cname="物料审核状态" optionLabel="全部" ename="inqu_status-0-materialStatus" colWidth="3">
<EF:EFOption label="未审核" value="0"/>
<EF:EFOption label="部分审核" value="1"/>
<EF:EFOption label="全部审核" value="2"/>
<EF:EFSelect cname="物料提交状态" optionLabel="全部" ename="inqu_status-0-materialStatus" colWidth="3">
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="部分提交" value="1"/>
<EF:EFOption label="全部提交" value="2"/>
</EF:EFSelect>
<EF:EFSelect cname="项目负责人" ename="inqu_status-0-princ1" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
......@@ -59,10 +59,10 @@
columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
filter="contains">
</EF:EFComboColumn>
<EF:EFComboColumn required="true" align="center" ename="materialStatus" cname="物料审核状态" defaultValue="0">
<EF:EFOption label="未审核" value="0"/>
<EF:EFOption label="部分审核" value="1"/>
<EF:EFOption label="全部审核" value="2"/>
<EF:EFComboColumn required="true" align="center" ename="materialStatus" cname="物料提交状态" defaultValue="0">
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="部分提交" value="1"/>
<EF:EFOption label="全部提交" value="2"/>
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="remark" cname="备注"/>
......
src/main/webapp/HP/ZL/HPZL001.js
......@@ -33,10 +33,10 @@ $(function() {
let auditStatus = item.status;
if (auditStatus == 0) {
return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
'onclick="audit(' + item.id + ',\'' + chkBillno + '\')" >审核</a>';
'onclick="audit(' + item.id + ',\'' + chkBillno + '\')" >提交</a>';
} else {
return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
'onclick="unAudit(' + item.id + ',\'' + chkBillno + '\')" >反审</a>';
'onclick="unAudit(' + item.id + ',\'' + chkBillno + '\')" >撤回</a>';
}
}
}]
......@@ -76,14 +76,14 @@ function openUploadFile(id) {
}
/**
* 审核操作
* 提交操作
*
* @param id
* @param chkBillno
* @param auditStatus
*/
function audit(id, chkBillNo) {
let message = "确认对单号[" + chkBillNo + "]进行审核操作吗? ";
let message = "确认对单号[" + chkBillNo + "]进行提交操作吗? ";
JSUtils.confirm(message, {
ok: function () {
JSUtils.submitGridsData("result", "HPZL001", "audit", true);
......@@ -92,14 +92,14 @@ function audit(id, chkBillNo) {
}
/**
* 反审操作
* 撤回操作
*
* @param id
* @param chkBillno
* @param auditStatus
*/
function unAudit(id, chkBillNo) {
let message = "确认对单号[" + chkBillNo + "]进行反审操作吗? ";
let message = "确认对单号[" + chkBillNo + "]进行撤回操作吗? ";
JSUtils.confirm(message, {
ok: function () {
JSUtils.submitGridsData("result", "HPZL001", "unAudit", true);
......
src/main/webapp/HP/ZL/HPZL001.jsp
......@@ -20,8 +20,8 @@
<EF:EFInput ename="inqu_status-0-princ" cname="检查人" colWidth="3" readonly="false"/>
<EF:EFSelect ename="inqu_status-0-status" cname="处理状态" colWidth="3">
<EF:EFOption label="--请选择--" value=""/>
<EF:EFOption label="审核" value="1"></EF:EFOption>
<EF:EFOption label="待审核" value="0"></EF:EFOption>
<EF:EFOption label="提交" value="1"></EF:EFOption>
<EF:EFOption label="待提交" value="0"></EF:EFOption>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -43,8 +43,8 @@
<EF:EFComboColumn ename="status" cname="状态" enable="false" align="center" textField="textField"
valueField="valueField" width="100" optionLabel=" ">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="审核" value="1"></EF:EFOption>
<EF:EFOption label="未审核" value="0"></EF:EFOption>
<EF:EFOption label="提交" value="1"></EF:EFOption>
<EF:EFOption label="未提交" value="0"></EF:EFOption>
</EF:EFComboColumn>
<EF:EFColumn ename="affix" cname="附件" enable="false" width="100" align="center"/>
<EF:EFColumn ename="operator" cname="操作" enable="false" width="100" readonly="false"/>
......
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