Skip to content

H
hg-smart
Commit 3ab17682 by 宋祥
Options

Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc

parents c83b4df6 02d6fd49
Showing with 268 additions and 102 deletions
src/main/java/com/baosight/hggp/common/DdynamicEnum.java
......@@ -405,6 +405,13 @@ public enum DdynamicEnum {
*/
ITEM_CODE_BLOCK_ID("itemCode_block_id","itemCode","itemName","itemModel","itemType","itemUnit","invQty","whCode","whName","HGBG001.queryItemCodeBox"),
/**
* 模块：销售管理
* 用途：销售计划单号下拉框
* 编写：ly
*/
PLAN_SALES_CODE_BLOCK_ID("planSalesCode_block_id","planSalesCode","planSalesCode","HGPZ018.queryPlanSalesCode"),
;
......
src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG005.java
......@@ -35,7 +35,7 @@ public class ServiceHGCG005 extends ServiceEPBase {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(
DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID,
DdynamicEnum.SUP_RECORD_BLOCK_ID,
DdynamicEnum.USER_BLOCK_ID), null, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG005().eiMetadata);
} catch (Exception e) {
......
src/main/java/com/baosight/hggp/hg/cw/domain/HGCW002.java
......@@ -65,6 +65,7 @@ public class HGCW002 extends DaoEPBase {
public static final String FIELD_COMPANY_CODES = "companyCodes";
public static final String FIELD_REMAINING_AMOUNT = "remainingAmount"; /* 剩余开票/收票金额*/
public static final String FIELD_BRANCH_UNIT = "branchUnit";
public static final String FIELD_PLAN_SALES_CODE = "planSalesCode"; /* 销售计划单号*/
public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
......@@ -158,6 +159,7 @@ public class HGCW002 extends DaoEPBase {
private BigDecimal remainingAmount = new BigDecimal("0"); /* 剩余开票/收票金额*/
private String contractTypeStr = ""; /* 合同类型;1销售合同2劳务合同3补充协议4合同外用工*/
private String branchUnit = " ";
private String planSalesCode = " "; /* 销售计划单号*/
/**
* initialize the metadata.
......@@ -349,6 +351,10 @@ public class HGCW002 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_BRANCH_UNIT);
eiColumn.setDescName("分支单位");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PLAN_SALES_CODE);
eiColumn.setDescName("销售计划单号");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -1023,6 +1029,14 @@ public class HGCW002 extends DaoEPBase {
this.branchUnit = branchUnit;
}
public String getPlanSalesCode() {
return planSalesCode;
}
public void setPlanSalesCode(String planSalesCode) {
this.planSalesCode = planSalesCode;
}
/**
* get the value from Map.
*
......@@ -1074,6 +1088,7 @@ public class HGCW002 extends DaoEPBase {
setRemainingAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_REMAINING_AMOUNT)), remainingAmount));
setContractTypeStr(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("contractTypeStr")), contractTypeStr));
setBranchUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("branchUnit")), branchUnit));
setPlanSalesCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("planSalesCode")), planSalesCode));
}
/**
......@@ -1126,6 +1141,7 @@ public class HGCW002 extends DaoEPBase {
map.put(FIELD_REMAINING_AMOUNT, StringUtils.toString(remainingAmount, eiMetadata.getMeta(FIELD_REMAINING_AMOUNT)));
map.put("contractTypeStr", StringUtils.toString(contractTypeStr, eiMetadata.getMeta("contractTypeStr")));
map.put("branchUnit", StringUtils.toString(branchUnit, eiMetadata.getMeta("branchUnit")));
map.put("planSalesCode", StringUtils.toString(planSalesCode, eiMetadata.getMeta("planSalesCode")));
return map;
}
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002.java
......@@ -75,7 +75,7 @@ public class ServiceHGCW002 extends ServiceBase {
if (list1.size() > 0){
list1 = list1.stream().filter(hgpz001 -> "分支单位".equals(hgpz001.getCustTypeName())).collect(Collectors.toList());
List<String> custTypeList = list1.stream().map(HGPZ001::getCustType).collect(Collectors.toList());
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID),
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID),
new HashMap<String, Object>(){{put("custTypes", custTypeList);}},false);
CommonMethod.comboBoxDefaultValue(outInfo,DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID.getBlockId());
}
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002A.java
......@@ -58,7 +58,7 @@ public class ServiceHGCW002A extends ServiceBase {
if (list1.size() > 0){
list1 = list1.stream().filter(hgpz001 -> "分支单位".equals(hgpz001.getCustTypeName())).collect(Collectors.toList());
List<String> custTypeList = list1.stream().map(HGPZ001::getCustType).collect(Collectors.toList());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID),
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID),
new HashMap<String, Object>(){{put("custTypes", custTypeList);}},false);
CommonMethod.comboBoxDefaultValue(inInfo,DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID.getBlockId());
}
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002B.java
......@@ -53,7 +53,7 @@ public class ServiceHGCW002B extends ServiceBase {
if (list1.size() > 0){
list1 = list1.stream().filter(hgpz001 -> "分支单位".equals(hgpz001.getCustTypeName())).collect(Collectors.toList());
List<String> custTypeList = list1.stream().map(HGPZ001::getCustType).collect(Collectors.toList());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID),
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID),
new HashMap<String, Object>(){{put("custTypes", custTypeList);}},false);
}
//获取清单
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002C.java
......@@ -47,7 +47,7 @@ public class ServiceHGCW002C extends ServiceBase {
if (list1.size() > 0){
list1 = list1.stream().filter(hgpz001 -> "分支单位".equals(hgpz001.getCustTypeName())).collect(Collectors.toList());
List<String> custTypeList = list1.stream().map(HGPZ001::getCustType).collect(Collectors.toList());
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID),
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,DdynamicEnum.PLAN_SALES_CODE_BLOCK_ID),
new HashMap<String, Object>(){{put("custTypes", custTypeList);}},false);
}
//获取清单
......
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW002.xml
......@@ -46,7 +46,8 @@
UPDATED_TIME as "updatedTime", <!-- 记录修改时间 -->
DEP_CODE as "depCode", <!-- 部门编码 -->
REMAINING_AMOUNT as "remainingAmount",
BRANCH_UNIT as "branchUnit"
BRANCH_UNIT as "branchUnit",
PLAN_SALES_CODE as "planSalesCode"
</sql>
<sql id="condition">
......@@ -180,6 +181,9 @@
<isNotEmpty prepend=" AND " property="branchUnit">
BRANCH_UNIT = #branchUnit#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planSalesCode">
PLAN_SALES_CODE like concat('%',#planSalesCode#,'%')
</isNotEmpty>
</sql>
<sql id="conditionExport">
......@@ -310,6 +314,9 @@
<isNotEmpty prepend=" AND " property="branchUnit">
A.BRANCH_UNIT = #branchUnit#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planSalesCode">
A.PLAN_SALES_CODE like concat('%',#planSalesCode#,'%')
</isNotEmpty>
</sql>
<sql id="customCondition">
......@@ -388,7 +395,8 @@
UPDATED_TIME, <!-- 记录修改时间 -->
DEP_CODE, <!-- 部门编码 -->
REMAINING_AMOUNT,
BRANCH_UNIT
BRANCH_UNIT,
PLAN_SALES_CODE
)
VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #projCode#, #projName#, #contractNumber#,
#contractName#, #contractType#, #contractCategory#, #partyA#, #partyB#, #partyC#, #planStartDate#,
......@@ -396,7 +404,7 @@
#engineeringAddress#, #signingDate#, #mainContractNumber#, #contractContent#, #contractingMethod#,
#paymentMethod#, #pricingMethod#, #taxPoints#, #totalContractPriceExcluding#, #valueAddedTax#,
#totalContractPriceIncluding#, #reviewStatus#, #balanceStatus#, #createdBy#, #createdName#, #createdTime#,
#updatedBy#, #updatedName#, #updatedTime#, #depCode#, #remainingAmount#, #branchUnit#)
#updatedBy#, #updatedName#, #updatedTime#, #depCode#, #remainingAmount#, #branchUnit#, #planSalesCode#)
<selectKey resultClass="long" keyProperty="id">
SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGCW002
</selectKey>
......@@ -449,7 +457,8 @@
UPDATED_NAME = #updatedName#, <!-- 记录修改名称 -->
UPDATED_TIME = #updatedTime#, <!-- 记录修改时间 -->
REMAINING_AMOUNT = #remainingAmount#,
BRANCH_UNIT = #branchUnit#
BRANCH_UNIT = #branchUnit#,
PLAN_SALES_CODE = #planSalesCode#
<!-- DEP_CODE = #depCode# 部门编码 -->
WHERE
ID = #id#
......@@ -737,7 +746,8 @@
A.TOTAL_CONTRACT_PRICE_INCLUDING as "totalContractPriceIncluding", <!-- 合同总价（含税） -->
G.ITEM_CNAME as "reviewStatus", <!-- 审核状态 -->
H.ITEM_CNAME as "balanceStatus", <!-- 结算状态；1未结算2部分结算3最终结算 -->
E.CUST_TYPE_NAME as "branchUnit"
E.CUST_TYPE_NAME as "branchUnit",
A.PLAN_SALES_CODE as "planSalesCode"
FROM ${hggpSchema}.HGCW002 A
LEFT JOIN ${hggpSchema}.HGCW002 B ON A.CONTRACT_NUMBER = B.MAIN_CONTRACT_NUMBER
LEFT JOIN ${platSchema}.TEDCM01 C ON A.CONTRACT_STATUS = C.ITEM_CODE AND C.CODESET_CODE = 'hggp.cw.contractStatus'
......
src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC005.java
......@@ -326,6 +326,9 @@ public class ServiceHGKC005 extends ServiceEPBase {
hgkc007.setSource(InventorySource.INVENTORY.getCode());
hgkc007.setSubmitStatus(HGConstant.ProductStatus.WTJ);
hgkc007.setSourceCode(hgkc005.getCheckNo());
AssertUtils.isTrue(Objects.isNull(hgkc007.getSource()) || hgkc007.getSource() <= 0, "其它出库单数据来源不能为空！");
AssertUtils.isTrue(StringUtils.isBlank(hgkc007.getWhCode()), "其它出库单仓库不能为空！");
DaoUtils.insert(HGKC007.INSERT, hgkc007);
//明细数据处理
HGKC007A hgkc007A = new HGKC007A();
hgkc007A.setPrimaryId(hgkc007.getId());
......@@ -342,16 +345,17 @@ public class ServiceHGKC005 extends ServiceEPBase {
//其他出库单的数量为正数
hgkc007A.setInvQty(hgkc005.getDiffAmount().negate());
hgkc007A.setInvUnitWeight(hgkc005.getBookUnitWeight());
hgkc007A.setInvWeight(hgkc005.getDiffWeight());
hgkc007A.setInvWeight(hgkc005.getDiffWeight().negate());
hgkc007A.setPrdtLength(hgpz005.getLength());
hgkc007A.setPrdtWidth(hgpz005.getWidth());
hgkc007A.setPrdtThick(hgpz005.getThick());
hgkc007A.setPrdtSpec(hgpz005.getSpec());
hgkc007A.setSource(InventorySource.INVENTORY.getCode());
hgkc007A.setInventTypeDetail(hgpz005.getInventTypeDetail());
hgkc007.getDetailList().add(hgkc007A);
HGKCTools.HgKc007.generateHgkc007(hgkc007);
HGKCTools.HgKc007A.checkData(hgkc007A);
DaoUtils.insert(HGKC007A.INSERT, hgkc007A);
//hgkc007.getDetailList().add(hgkc007A);
//HGKCTools.HgKc007.generateHgkc007(hgkc007);
}
//如果差异数量大于0则为盘盈，生成入库单
if(hgkc005.getDiffAmount().compareTo(BigDecimal.ZERO) > 0){
......
src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java
......@@ -941,6 +941,15 @@ public class HGKCTools {
}
return results;
}
public static void checkData(HGKC007A hgkc007a) {
AssertUtils.isTrue(StringUtils.isBlank(hgkc007a.getWhCode()), "其它出库单明细仓库不能为空！");
AssertUtils.isTrue(StringUtils.isBlank(hgkc007a.getInventCode()), "其它出库单明细存货编码不能为空！");
AssertUtils.isTrue(StringUtils.isBlank(hgkc007a.getInventName()), "其它出库单明细存货名称不能为空！");
AssertUtils.isTrue(hgkc007a.getInvQty().compareTo(BigDecimal.ZERO) <= 0, "其它出库单明细数量不能小于等于0！");
AssertUtils.isTrue(hgkc007a.getInvUnitWeight().compareTo(BigDecimal.ZERO) <= 0, "其它出库单明细单重小于等于0！");
AssertUtils.isTrue(hgkc007a.getInvWeight().compareTo(BigDecimal.ZERO) <= 0, "其它出库单明细总重小于等于0！");
}
}
/**
......
src/main/java/com/baosight/hggp/hg/pz/constant/HgPzSqlConstant.java
......@@ -18,6 +18,14 @@ public class HgPzSqlConstant {
public static final String UPDATE_COMPOSING_COEFF = MODULE + "updateComposingCoeff";
}
public class HgPz015A {
// 模块名称
public static final String MODULE = "HGPZ015A.";
// 批量新增
public static final String BATCH_INSERT = MODULE + "batchInsert";
}
/**
*
* @author songx
......
src/main/java/com/baosight/hggp/hg/pz/domain/HGPZ015A.java
......@@ -104,11 +104,11 @@ public class HGPZ015A extends DaoEPBase {
public static final String COL_PGSTATUS = "PGSTATUS"; /* 派工状态*/
public static final String COL_LV = "LV"; /* 树的层级*/
public static final String QUERY = "HPSC002.query";
public static final String COUNT = "HPSC002.count";
public static final String INSERT = "HPSC002.insert";
public static final String UPDATE = "HPSC002.update";
public static final String DELETE = "HPSC002.delete";
public static final String QUERY = "HGPZ015A.query";
public static final String COUNT = "HGPZ015A.count";
public static final String INSERT = "HGPZ015A.insert";
public static final String UPDATE = "HGPZ015A.update";
public static final String DELETE = "HGPZ015A.delete";
private Long id;
private String accountCode = " "; /* 企业编码 预留*/
......@@ -138,8 +138,8 @@ public class HGPZ015A extends DaoEPBase {
private String filePath3 = " "; /* 文件地址3*/
private String filePath4 = " "; /* 文件地址4*/
private String filePath5 = " "; /* 文件地址5*/
private Integer status; /* 状态 0-未审核，1-已审核*/
private Integer delStatus; /* 状态 1未删除，0已删除*/
private Integer status = 0; /* 状态 0-未审核，1-已审核*/
private Integer delStatus = 0; /* 状态 1未删除，0已删除*/
private String createdBy = " "; /* 创建人*/
private String createdName = " "; /* 创建人名称*/
private String createdTime = " "; /* 创建时间*/
......
src/main/java/com/baosight/hggp/hg/pz/service/ServiceHGPZ015.java
......@@ -4,6 +4,7 @@ import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
import com.baosight.hggp.core.dao.DaoBase;
import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.core.security.UserSessionUtils;
import com.baosight.hggp.hg.pz.constant.HgPzSqlConstant;
import com.baosight.hggp.hg.pz.domain.HGPZ015;
import com.baosight.hggp.hg.pz.domain.HGPZ015A;
import com.baosight.hggp.hg.pz.tools.HGPZTools;
......@@ -11,6 +12,7 @@ import com.baosight.hggp.hg.sc.domain.HGSC004;
import com.baosight.hggp.hg.sc.domain.HGSC004A;
import com.baosight.hggp.hg.sc.tools.HGSCTools;
import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.BeanUtils;
import com.baosight.hggp.util.EiInfoUtils;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......@@ -20,10 +22,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
*
......@@ -52,7 +51,7 @@ public class ServiceHGPZ015 extends ServiceBase {
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
EiInfo outInfo = super.query(inInfo, "HGPZ015.query", new HGPZ015());
EiInfo outInfo = super.query(inInfo, HGPZ015.QUERY, new HGPZ015());
return outInfo;
}
......@@ -64,7 +63,7 @@ public class ServiceHGPZ015 extends ServiceBase {
public EiInfo count(EiInfo inInfo) {
HashMap map = new HashMap();
map.put("projCode",inInfo.getString("projCode"));
List<HGPZ015> query = DaoBase.getInstance().query("HPPZ015.query", map);
List<HGPZ015> query = DaoBase.getInstance().query(HGPZ015.QUERY, map);
if (query.size() > 0) {
inInfo.setStatus(1);
inInfo.set("tempName",query.get(0).getTemplateName());
......@@ -83,7 +82,7 @@ public class ServiceHGPZ015 extends ServiceBase {
public EiInfo insert(EiInfo inInfo) {
HashMap map = new HashMap();
map.put("projCode",inInfo.getString("projCode"));
List<HGPZ015> query = DaoBase.getInstance().query("HGPZ015.query", map);
List<HGPZ015> query = DaoBase.getInstance().query(HGPZ015.QUERY, map);
List<HGSC004> hpsc004s = HGSCTools.Hgsc004.queryProjCode(inInfo.getString("projCode"));
if (query.size() > 0) {
dao.delete("HGPZ015.deleteByProjCode",map);
......@@ -98,24 +97,27 @@ public class ServiceHGPZ015 extends ServiceBase {
hgpz015.setRemark(inInfo.getString("materialId"));
hgpz015.setUpdatedBy(null);
hgpz015.setUpdatedTime(null);
DaoUtils.insert("HGPZ015.insert", hgpz015);
DaoUtils.insert(HGPZ015.INSERT, hgpz015);
//模板物料清单
List<HGSC004A> hpsc004aList = DaoBase.getInstance().query("HGSC004A.query", new HashMap<String, Object>(){{
List<HGSC004A> hpsc004aList = DaoBase.getInstance().query(HGSC004A.QUERY, new HashMap<String, Object>(){{
put("projCode", hpsc004s.get(0).getProjCode());
put("materialId", inInfo.getString("materialId"));
}});
if (hpsc004aList.size() > 0){
List<HGPZ015A> rows = new ArrayList<>();
hpsc004aList.forEach(hgsc004A ->{
HGPZ015A hgpz015A = new HGPZ015A();
hgpz015A.fromMap(hgsc004A.toMap());
//hgpz015A.fromMap(hgsc004A.toMap());
BeanUtils.copyProperties(hgsc004A,hgpz015A);
initHgpz015(hgpz015A,hgsc004A);
hgpz015A.setRemark(hgpz015.getId().toString());
if (hgsc004A.getLeaf().toString().equals(inInfo.getString("templateName"))){
hgpz015A.setParentPrdtName("");
}
hgpz015A.setId(null);
DaoUtils.insert("HGPZ015A.insert", hgpz015A);
rows.add(hgpz015A);
});
DaoUtils.batchInsert(HgPzSqlConstant.HgPz015A.BATCH_INSERT, rows);
}
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsg("生成产品模板成功！");
......@@ -219,21 +221,21 @@ public class ServiceHGPZ015 extends ServiceBase {
}
public void initHgpz015(HGPZ015A hgpz015A,HGSC004A hgsc004A){
hgpz015A.setProjCode(hgsc004A.getProjCode());
hgpz015A.setProjName(hgsc004A.getProjName());
//hgpz015A.setProjCode(hgsc004A.getProjCode());
//hgpz015A.setProjName(hgsc004A.getProjName());
hgpz015A.setParentId(hgsc004A.getId().toString());
hgpz015A.setParentPrdtCode(hgsc004A.getParentProdCode());
hgpz015A.setParentPrdtName(hgsc004A.getParentProdName());
hgpz015A.setLeaf(hgsc004A.getLeaf().toString());
//hgpz015A.setParentPrdtCode(hgsc004A.getParentProdCode());
//hgpz015A.setParentPrdtName(hgsc004A.getParentProdName());
//hgpz015A.setLeaf(hgsc004A.getLeaf().toString());
hgpz015A.setPrdtType(Integer.valueOf(hgsc004A.getProductType()));
hgpz015A.setInventRecordId(hgsc004A.getProductId());
hgpz015A.setPrdtCode(hgsc004A.getProductCode());
hgpz015A.setPrdtName(hgsc004A.getProductName());
hgpz015A.setSpec(hgsc004A.getSpec());
hgpz015A.setLength(hgsc004A.getLength());
hgpz015A.setWidth(hgsc004A.getWidth());
hgpz015A.setThick(hgsc004A.getThick());
hgpz015A.setLv(hgsc004A.getLv());
//hgpz015A.setSpec(hgsc004A.getSpec());
//hgpz015A.setLength(hgsc004A.getLength());
//hgpz015A.setWidth(hgsc004A.getWidth());
//hgpz015A.setThick(hgsc004A.getThick());
//hgpz015A.setLv(hgsc004A.getLv());
hgpz015A.setNum(hgsc004A.getQuantity());
hgpz015A.setUnitWt(hgsc004A.getSingleWeight());
hgpz015A.setTotalWt(hgsc004A.getTotalWeight());
......
src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ015A.xml
......@@ -220,6 +220,53 @@
#length#, #width#, #thick#)
</insert>
<insert id="batchInsert">
INSERT INTO ${hggpSchema}.hgpz015a (
ACCOUNT_CODE, <!-- 企业编码 预留 -->
DEP_CODE, <!-- 部门编码 预留 -->
PROJ_CODE, <!-- 项目编码 -->
PROJ_NAME, <!-- 项目名称 -->
PARENT_ID, <!-- 父节点-部件编码 -->
PARENT_PRDT_CODE,
PARENT_PRDT_NAME, <!-- 父节点-部件名称 -->
TYPE, <!-- 类别 -->
LEAF, <!-- 是否有叶子节点 -->
SORT, <!-- 排序字段 -->
ICON, <!-- 图片地址 -->
PRDT_TYPE,
PRDT_CODE, <!-- 部件编码 -->
PRDT_NAME, <!-- 部件名称 -->
INVENT_RECORD_ID, <!-- 存货档案ID -->
NUM, <!-- 数量 -->
UNIT_WT, <!-- 单重 -->
TOTAL_WT, <!-- 总重 -->
FILE_PATH1, <!-- 文件地址1 -->
FILE_PATH2, <!-- 文件地址2 -->
FILE_PATH3, <!-- 文件地址3 -->
FILE_PATH4, <!-- 文件地址4 -->
FILE_PATH5, <!-- 文件地址5 -->
STATUS, <!-- 状态 0-未提交，1-已提交 -->
DEL_STATUS, <!-- 状态 1未删除，0已删除 -->
CREATED_BY, <!-- 创建人 -->
CREATED_NAME,
CREATED_TIME, <!-- 创建时间 -->
REMARK, <!-- 备注 -->
LV,
SPEC,
LENGTH, <!-- 长 -->
WIDTH, <!-- 宽 -->
THICK <!-- 厚 -->
) VALUES
<iterate open="(" conjunction="), (" close=")" property="rows">
#rows[].accountCode#, #rows[].depCode#, #rows[].projCode#, #rows[].projName#, #rows[].parentId#,
#rows[].parentPrdtCode#, #rows[].parentPrdtName#, #rows[].type#, #rows[].leaf#, #rows[].sort#, #rows[].icon#,
#rows[].prdtType#, #rows[].prdtCode#, #rows[].prdtName#, #rows[].inventRecordId#, #rows[].num#, #rows[].unitWt#, #rows[].totalWt#,
#rows[].filePath1#, #rows[].filePath2#, #rows[].filePath3#, #rows[].filePath4#, #rows[].filePath5#,
#rows[].status#, #rows[].delStatus#, #rows[].createdBy#, #rows[].createdName#, #rows[].createdTime#,
#rows[].remark#, #rows[].lv#, #rows[].spec#, #rows[].length#, #rows[].width#, #rows[].thick#
</iterate>
</insert>
<insert id="insertMb" parameterClass="java.util.HashMap">
INSERT INTO ${hggpSchema}.hgpz015a(
ID,
......
src/main/java/com/baosight/hggp/hg/sc/domain/HGSC001.java
......@@ -53,6 +53,7 @@ public class HGSC001 extends DaoEPBase {
public static final String FIELD_end_date = "endDate"; /* 完工日期*/
public static final String FIELD_project_source = "projectSource"; /* 项目来源*/
public static final String FIELD_branch_unit = "branchUnit"; /*分子单位*/
public static final String FIELD_PLAN_SALES_CODE = "planSalesCode"; /* 销售计划单号*/
public static final String COL_id = "id";
public static final String COL_account_code = "account_code"; /* 帐套*/
......@@ -122,6 +123,7 @@ public class HGSC001 extends DaoEPBase {
private String endDate = " "; /* 完工日期*/
private String projectSource = " "; /* 项目来源*/
private String branchUnit = " "; /*分支单位*/
private String planSalesCode = " "; /* 销售计划单号*/
/**
* initialize the metadata.
......@@ -254,7 +256,9 @@ public class HGSC001 extends DaoEPBase {
eiColumn.setDescName("分支单位");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_PLAN_SALES_CODE);
eiColumn.setDescName("销售计划单号");
eiMetadata.addMeta(eiColumn);
}
/**
......@@ -753,6 +757,14 @@ public class HGSC001 extends DaoEPBase {
this.branchUnit = branchUnit;
}
public String getPlanSalesCode() {
return planSalesCode;
}
public void setPlanSalesCode(String planSalesCode) {
this.planSalesCode = planSalesCode;
}
/**
* get the value from Map.
*
......@@ -792,6 +804,7 @@ public class HGSC001 extends DaoEPBase {
setEndDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_end_date)), endDate));
setProjectSource(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_project_source)), projectSource));
setBranchUnit(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_branch_unit)), branchUnit));
setPlanSalesCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_SALES_CODE)), planSalesCode));
}
/**
......@@ -832,6 +845,7 @@ public class HGSC001 extends DaoEPBase {
map.put(FIELD_end_date, StringUtils.toString(endDate, eiMetadata.getMeta(FIELD_end_date)));
map.put(FIELD_project_source, StringUtils.toString(projectSource, eiMetadata.getMeta(FIELD_project_source)));
map.put(FIELD_branch_unit, StringUtils.toString(branchUnit, eiMetadata.getMeta(FIELD_branch_unit)));
map.put(FIELD_PLAN_SALES_CODE, StringUtils.toString(planSalesCode, eiMetadata.getMeta(FIELD_PLAN_SALES_CODE)));
return map;
}
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC001.xml
......@@ -33,7 +33,8 @@
start_date as "startDate", <!-- 开工日期 -->
end_date as "endDate", <!-- 完工日期 -->
project_source as "projectSource", <!-- 项目来源 -->
branch_unit as "branchUnit" <!-- 分公司 -->
branch_unit as "branchUnit", <!-- 分公司 -->
PLAN_SALES_CODE as "planSalesCode"
</sql>
<sql id="condition">
......@@ -122,6 +123,9 @@
<isNotEmpty prepend=" AND " property="branchUnit">
branch_unit = #branchUnit#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planSalesCode">
PLAN_SALES_CODE = #planSalesCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="custCodes">
(subcontract_code in <iterate close=")" open="(" conjunction="," property="custCodes">#custCodes[]#</iterate>
or genral_contract_code in <iterate close=")" open="(" conjunction="," property="custCodes">#custCodes[]#</iterate>)
......@@ -208,6 +212,9 @@
<isNotEmpty prepend=" AND " property="branchUnit">
A.branch_unit = #branchUnit#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="planSalesCode">
A.PLAN_SALES_CODE = #planSalesCode#
</isNotEmpty>
</sql>
<sql id="customCondition">
......@@ -280,13 +287,14 @@
updated_time, <!-- 更新时间 -->
contract_no, <!-- 合同号 -->
project_source,
branch_unit
branch_unit,
PLAN_SALES_CODE
)
VALUES (#id#, #companyCode#, #companyName#, #depCode#, #depName#, #subcontractCode#, #subcontractName#,
#genralContractCode#, #genralContractName#, #partyPmName#, #partyPmHpone#, #contractName#, #contractWorkTxt#,
#projCode#, #projName#, #projType#, #projStatus#, #approvalStatus#, #permissStartDate#, #startDate#, #endDate#,
#accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#,
#contractNo#, #projectSource#, #branchUnit#)
#contractNo#, #projectSource#, #branchUnit#, #planSalesCode#)
<selectKey resultClass="long" keyProperty="id">
SELECT MAX(ID) AS "id" FROM ${hggpSchema}.HGSC001
</selectKey>
......@@ -329,7 +337,8 @@
updated_by = #updatedBy#, <!-- 更新人 -->
updated_name = #updatedName#, <!-- 修改人名称 -->
updated_time = #updatedTime#, <!-- 更新时间 -->
branch_unit = #branchUnit#
branch_unit = #branchUnit#,
PLAN_SALES_CODE = #planSalesCode#
WHERE id = #id#
</update>
......@@ -466,7 +475,8 @@
A.permiss_start_date as "permissStartDate", <!-- 准许开工日期 -->
A.start_date as "startDate", <!-- 开工日期 -->
A.end_date as "endDate", <!-- 完工日期 -->
E.CUST_TYPE_NAME as "branchUnit" <!-- 分公司 -->
E.CUST_TYPE_NAME as "branchUnit", <!-- 分公司 -->
A.PLAN_SALES_CODE as "planSalesCode"
FROM ${hggpSchema}.HGSC001 A
LEFT JOIN ${hggpSchema}.HGPZ001 E ON A.BRANCH_UNIT = E.CUST_TYPE
LEFT JOIN ${hggpSchema}.HGPZ008 B ON A.proj_type = B.NAT_CODE
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
......@@ -1018,9 +1018,9 @@
select
a.factoryCode ,
a.factoryName ,
ROUND(ifnull(sum(a.dayWt),0)/1000, 4) as dayWeight,
ROUND(ifnull(sum(a.monthWt),0)/1000, 4) as monthWeight,
ROUND(ifnull(sum(a.yearWt),0)/1000, 4) as yearWeight
ROUND(ifnull(sum(a.dayWt),0)/1000, 2) as dayWeight,
ROUND(ifnull(sum(a.monthWt),0)/1000, 2) as monthWeight,
ROUND(ifnull(sum(a.yearWt),0)/1000, 2) as yearWeight
from (
select
h2.factory_code as factoryCode ,
......@@ -1118,7 +1118,7 @@
h2.factory_name as "factoryName",
h2.process_code as "processCode",
h2.process_name as "processName",
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 4) "totalWeight"
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 2) "totalWeight"
from ${hggpSchema}.hgkc003 h inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
where 1 = 1 and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
<include refid="appCondition"/>
......@@ -1136,8 +1136,8 @@
a.proj_code as projCode,
a.proj_name as projName,
a.finish_date as completeDate,
ROUND(ifnull(sum(a.total_weight),0)/1000, 4) as totalWeight,
ROUND(ifnull(sum(a.finish_weight),0)/1000, 4) as finishWeight,
ROUND(ifnull(sum(a.total_weight),0)/1000, 2) as totalWeight,
ROUND(ifnull(sum(a.finish_weight),0)/1000, 2) as finishWeight,
ifnull(sum(a.finish_weight),0) / ifnull(sum(a.total_weight),0) * 100 as schedule,
a.updated_time as updatedTime
from (
......@@ -1236,14 +1236,14 @@
<!--工序日产量-->
<select id="queryByWt" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
select
A.process_code as "processCode",
A.process_name as "processName",
ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000, 4) "totalWeight"
from ${hggpSchema}.HGGY001 A
join ${platSchema}.TXSOG01 C on A.FACTORY_CODE = C.COMPANY_CODE
left join (
select
h2.process_code ,
ROUND(ifnull(SUM(h.INV_WEIGHT), 0)/ 1000, 4) "INV_WEIGHT"
ifnull(SUM(h.INV_WEIGHT), 0) "INV_WEIGHT"
from ${hggpSchema}.hgkc003 h
inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
where 1 = 1
......@@ -1259,58 +1259,64 @@
<isNotEmpty prepend=" AND " property="accountCode">
A.account_code = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="factoryName">
C.factory_name = #factoryName#
<isNotEmpty property="factoryCode">
<isEqual prepend=" AND " property="accountCode" compareValue="Q24072514">
A.factory_code = 'R24072606'
</isEqual>
<isNotEqual prepend=" AND " property="accountCode" compareValue="Q24072514">
A.factory_code = (select distinct COMPANY_CODE from ${platSchema}.TXSOG01 where FACTORY_CODE = #factoryCode#)
</isNotEqual>
</isNotEmpty>
group by
A.process_name
A.process_code, A.process_name
</select>
<!--工序累计产量-->
<select id="queryBySunWt" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
select
A.SORT as "sort",
A.process_code as "processCode",
A.process_name as "processName",
ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000, 4) "totalWeight"
ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000, 2) "totalWeight"
from ${hggpSchema}.HGGY001 A
join ${platSchema}.TXSOG01 C on A.FACTORY_CODE = C.COMPANY_CODE
left join (
select
h.COMPANY_CODE,
h2.process_code ,
ROUND(ifnull(SUM(h.INV_WEIGHT), 0)/ 1000, 4) "INV_WEIGHT"
ifnull(SUM(h.INV_WEIGHT), 0) "INV_WEIGHT"
from ${hggpSchema}.hgkc003 h
inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
where 1 = 1
and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
where h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
<include refid="appCondition"/>
<include refid="appOrderCondition"/>
<isNotEmpty prepend=" AND " property="depositDate">
left(h.DEPOSIT_DATE,6) = left(#depositDate#,6)
</isNotEmpty>
group by h.COMPANY_CODE, h2.process_code
) B on A.FACTORY_CODE = B.COMPANY_CODE AND A.process_code = B.process_code
where 1=1 and DELETE_FLAG = '0' and reveal = 1
) B on A.process_code = B.process_code
where DELETE_FLAG = '0' and reveal = 1
<isNotEmpty prepend=" AND " property="accountCode">
A.account_code = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="processNames">
A.process_name IN <iterate close=")" open="(" conjunction="," property="processNames">#processNames[]#</iterate>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="factoryCode">
C.factory_code = #factoryCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="factoryName">
C.factory_name = #factoryName#
<isNotEmpty property="factoryCode">
<isEqual prepend=" AND " property="accountCode" compareValue="Q24072514">
A.factory_code = 'R24072606'
</isEqual>
<isNotEqual prepend=" AND " property="accountCode" compareValue="Q24072514">
A.factory_code = (select distinct COMPANY_CODE from ${platSchema}.TXSOG01 where FACTORY_CODE = #factoryCode#)
</isNotEqual>
</isNotEmpty>
group by
A.SORT, A.process_name
A.SORT, A.process_code, A.process_name
order by A.SORT
</select>
<!--日期到条件7天日产量-->
<select id="queryByDayWt" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
select
A.DEPOSIT_DATE as "depositDate",
ROUND(ifnull(SUM(A.INV_WEIGHT),0)/1000, 4) "totalWeight"
ifnull(SUM(A.INV_WEIGHT),0) "totalWeight"
from (
select
replace(date_sub(str_to_date(#depositDate#, '%Y%m%d'), interval 6 day), '-', '') as "DEPOSIT_DATE",
......
src/main/java/com/baosight/hggp/hg/wd/domain/HGWD001.java
......@@ -47,7 +47,7 @@ public class HGWD001 extends DaoEPBase {
public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_RELEASE_DATE = "releaseDate"; /* 发布时间*/
public static final String FIELD_FILE_PATH = "filePath"; /* 文件路径*/
public static final String FIELD_FILE_ID_PATH = "filePath"; /* 文件ID路径*/
public static final String FIELD_FILE_ID_PATH = "fileIdPath"; /* 文件ID路径*/
public static final String COL_ID = "ID";
public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE"; /* 企业编码*/
......
src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001.java
......@@ -517,7 +517,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
}*/
// 要复制目录集合
if (Objects.nonNull(detail2Rows)) {
String parentId = detail2Rows.get(0).getFileId().length() > 0 ? detail2Rows.get(0).getFileId()
String parentId = detail2Rows.get(0).getFileId().trim().length() > 0 ? detail2Rows.get(0).getFileId()
: detail2Rows.get(0).getProjCode();
if (!StringUtils.isNull(result2Rows)) {
result2Rows.forEach(hgwd001 -> {
......
src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml
......@@ -419,9 +419,11 @@
'' as "FILE_ID", <!-- 文件ID -->
'' as "FILE_TYPE", <!-- 文件类型 -->
'' as "FILE_NAME", <!-- 文件名称 -->
PROJECT_SOURCE as "FILE_PATH",
PROJ_CODE as "FILE_ID_PATH"
FROM ${hggpSchema}.HGSC001 T WHERE 1=1
case when te.ITEM_CNAME is null then concat(project_source,'/',PROJ_NAME) else concat(ITEM_CNAME,'/',PROJ_NAME) end as "FILE_PATH",
concat(project_source,'/',PROJ_CODE) as "FILE_ID_PATH"
FROM ${hggpSchema}.HGSC001 T
left join iplat_hggp.tedcm01 te on T.project_source = te.ITEM_CODE and te.CODESET_CODE = 'app.sc.projectSource'
WHERE 1=1
<isNotEmpty prepend=" AND " property="accountCode">
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
......
src/main/webapp/HG/BI/HGBI003.jsp
......@@ -536,7 +536,7 @@
},
grid: {
top: '13%', // 图表距离容器顶部的距离
top: '17%', // 图表距离容器顶部的距离
bottom: '2%', // 图表距离容器底部的距离，为下方的文字留出空间
left: '2%',
right: '2%',
......
src/main/webapp/HG/CG/HGCG005.jsp
......@@ -45,7 +45,7 @@
<EF:EFColumn ename="inquiryDate" cname="询价日期" align="center" width="150" readonly="true" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFColumn ename="inquiryNumber" cname="询价单号" enable="false" width="130" align="center" />
<EF:EFComboColumn ename="supplierName" cname="供应商名称" blockName="supplier_record_block_id"
<EF:EFComboColumn ename="supplierName" cname="供应商名称" blockName="sup_record_block_id"
columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField"
maxLength="16" readonly="false" width="160" required="true"
......
src/main/webapp/HG/CW/HGCW002.jsp
......@@ -66,6 +66,11 @@
<EF:EFCodeOption codeName="hggp.cw.balanceStatus"/>
</EF:EFSelect>
<EF:EFInput cname="创建人" ename="createdName" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFSelect ename="inqu_status-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
......@@ -76,6 +81,8 @@
sort="false"/>
<EF:EFColumn ename="companyName" cname="所属公司" enable="false" width="160" align="left"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#companyName#')? false: true}"/>
<EF:EFColumn ename="planSalesCode" cname="销售计划单号" enable="false" width="120" align="center"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#planSalesCode#')? false: true}"/>
<EF:EFColumn ename="projCode" cname="项目编号" align="center" enable="false" width="140"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#projCode#')? false: true}"/>
<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="160" align="left"
......
src/main/webapp/HG/CW/HGCW002A.jsp
......@@ -25,15 +25,16 @@
</div>
<div class="row">
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="false" />
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" required="true"/>
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="3" readonly="false" />
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="3" required="true"/>
<EF:EFInput ename="result-0-contractCategory" cname="合同类别" type="hidden"/>
<EF:EFInput ename="contractCategory" cname="合同类别" colWidth="4" readonly="true"/>
<%-- <EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="4" filter="contains" readonly="true" required="true">--%>
<%-- <EF:EFOption label="-- 请选择 --" value=""/>--%>
<%-- <EF:EFCodeOption codeName="hggp.cw.contractCategory"/>--%>
<%-- </EF:EFSelect>--%>
<EF:EFInput ename="contractCategory" cname="合同类别" colWidth="3" readonly="true"/>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="3"
......
src/main/webapp/HG/CW/HGCW002B.jsp
......@@ -27,15 +27,16 @@
</div>
<div class="row">
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="false" />
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" required="true"/>
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="3" readonly="false" />
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="3" required="true"/>
<EF:EFInput ename="result-0-contractCategory" cname="合同类别" type="hidden"/>
<EF:EFInput ename="contractCategory" cname="合同类别" colWidth="4" readonly="true"/>
<%-- <EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="4" filter="contains" readonly="true" required="true">--%>
<%-- <EF:EFOption label="-- 请选择 --" value=""/>--%>
<%-- <EF:EFCodeOption codeName="hggp.cw.contractCategory"/>--%>
<%-- </EF:EFSelect>--%>
<EF:EFInput ename="contractCategory" cname="合同类别" colWidth="3" readonly="true"/>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="3"
......
src/main/webapp/HG/CW/HGCW002C.jsp
......@@ -22,12 +22,13 @@
</div>
<div class="row">
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" readonly="true"/>
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="true" />
<EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="4" filter="contains" readonly="true" enable="false">
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="3" readonly="true"/>
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="3" readonly="true" />
<EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="3" filter="contains" readonly="true" enable="false">
<EF:EFOption label="-- 请选择 --" value=""/>
<EF:EFCodeOption codeName="hggp.cw.contractCategory"/>
</EF:EFSelect>
<EF:EFInput ename="result-0-planSalesCode" cname="销售计划单号" colWidth="3" readonly="true"/>
</div>
<div class="row">
<EF:EFInput ename="result-0-partyA" cname="甲方名称" colWidth="3" readonly="true"/>
......
src/main/webapp/HG/PZ/HGPZ022.jsp
......@@ -11,7 +11,7 @@
<EF:EFInput ename="inqu_status-0-sourceBillNo" cname="业务单据号" colWidth="3" placeholder="模糊查询"/>
<EF:EFSelect ename="inqu_status-0-billStatus" cname="抛帐状态" colWidth="3" valueTemplate="#=textField#">
<EF:EFOption label="全部" value=""/>
<EF:EFOption label="发送中" value="10"/>
<EF:EFOption label="待抛账" value="10"/>
<EF:EFOption label="抛帐成功" value="20"/>
<EF:EFOption label="抛帐失败" value="30"/>
</EF:EFSelect>
......@@ -32,7 +32,7 @@
<EF:EFColumn cname="摘要" ename="voucherSummary" align="left" width="120" enable="false"/>
<EF:EFComboColumn cname="抛帐状态" ename="billStatus" width="120" enable="false" readonly="true" >
<EF:EFOption label="" value=" "/>
<EF:EFOption label="发送中" value="10"/>
<EF:EFOption label="待抛账" value="10"/>
<EF:EFOption label="抛帐成功" value="20"/>
<EF:EFOption label="抛帐失败" value="30"/>
</EF:EFComboColumn>
......
src/main/webapp/HG/SB/HGSB001.jsp
......@@ -77,7 +77,7 @@
displayType="0" sort="true" align="right" maxLength="15" required="true"
data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFColumn ename="maintainDate" cname="保养日期" width="120" align="center" editType="date"
<EF:EFColumn ename="maintainDate" cname="保养日期" width="120" align="center" editType="date" hidden="true"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
<EF:EFComboColumn ename="deviceUserId" cname="设备负责人" defaultValue="${loginName}"
columnTemplate="#=textField#" itemTemplate="#=textField#"
......
src/main/webapp/HG/WD/HGWD001.jsp
......@@ -168,7 +168,7 @@
<EF:EFGrid blockId="detail2" autoDraw="override" autoBind="false" isFloat="true" checkMode="single" queryMethod="queryDetail2">
<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
<EF:EFColumn ename="parentId" cname="上级ID" hidden="true"/>
<EF:EFColumn ename="filePath" cname="文件路径" hidden="true"/>
<EF:EFColumn ename="filePath" cname="文件路径" hidden="false"/>
<%--<EF:EFComboColumn ename="projCode" cname="项目名称" blockName="proj_record_block_id"
columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField"
......@@ -189,7 +189,7 @@
<EF:EFGrid blockId="result2" autoDraw="override" autoBind="false" isFloat="true" checkMode="row " queryMethod="query2">
<EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
<EF:EFColumn ename="parentId" cname="上级ID" hidden="true"/>
<EF:EFColumn ename="filePath" cname="文件路径" hidden="true"/>
<EF:EFColumn ename="filePath" cname="文件路径" hidden="false"/>
<%--<EF:EFComboColumn ename="projCode" cname="项目名称" blockName="proj_record_block_id"
columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField"
......
src/main/webapp/HG/WD/HGWD001E.js
......@@ -154,6 +154,11 @@ let save = function (btnNode) {
flag = false;
return false;
}
if(isChinese(fileName)){
message("选中的第"+(index+1)+"行\"目录名称\",不能包含特殊字符!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
......
src/main/webapp/HG/WD/HGWD001F.js
......@@ -133,6 +133,11 @@ let save = function (btnNode) {
flag = false;
return false;
}
if(isChinese(fileName)){
message("选中的第"+(index+1)+"行\"目录名称\",不能包含特殊字符!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
......
src/main/webapp/common/js/common.js
......@@ -10,6 +10,17 @@ function isBlank(data) {
}
/**
* 是否为中文 不包含特殊字符
* @param str 字符串
* @returns {boolean} true:包含中文，false:不包含中文
*/
function isChinese(str){
let reg = /^[\u4e00-\u9fa5_a-zA-Z0-9]+$/;
return !reg.test(str);
}
/**
* 是否数字
*
* @param val
......
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