Skip to content

H
hg-smart
Commit d1ce7e41 by 江和松
Options

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

parents ac3f0f37 0cdfd3ca
Showing with 154 additions and 54 deletions
src/main/java/com/baosight/hggp/common/DdynamicEnum.java
......@@ -179,7 +179,7 @@ public enum DdynamicEnum {
* 用途：调拨单下拉框
* 编写：ly
*/
WH_RECORD_BOX_BLOCK_ID("wh_record_box_block_id", "whCode", "whName","companyCode","companyName", "HGKC010.queryWhCodeBox",
WH_RECORD_BOX_BLOCK_ID("wh_record_box_block_id", "whCode", "whName","companyCode","companyName","whType","whTypeName", "HGKC010.queryWhCodeBox",
new HashMap<String,Object>(){{
put("deleteFlag", CommonConstant.YesNo.NO_0);
}}),
......@@ -274,7 +274,7 @@ public enum DdynamicEnum {
* 用途：工序设计下拉框
* 编写：ly
*/
COMPANY_BOX_BLOCK_ID("companyBox_block_id","orgEname","orgCname","HGSJ001.queryCompany",
COMPANY_BOX_BLOCK_ID("companyBox_block_id","orgEname","orgCname","parentOrgId","orgType","HGSJ001.queryCompany",
new HashMap<String,Object>(){{
put("orgType", OrgTypeEnum.COMPANY.getCode());
}}),
......
src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002.java
......@@ -256,8 +256,8 @@ public class ServiceHGCG002 extends ServiceBase {
String contractNo = fCg002.getContractNo();
HGCG002 dbCg002 = dbCg002AMap.get(contractNo);
AssertUtils.isNull(dbCg002, String.format("合同[%s]不存在", contractNo));
AssertUtils.isTrue(StringUtils.isBlank(dbCg002.getSupName()), String.format("合同[%s]供应商为空", contractNo));
AssertUtils.isTrue(StringUtils.isBlank(dbCg002.getPurUserName()), String.format("合同[%s]采购员为空", contractNo));
AssertUtils.isTrue(StringUtils.isBlank(fCg002.getSupName()), String.format("合同[%s]供应商为空", contractNo));
AssertUtils.isTrue(StringUtils.isBlank(fCg002.getPurUserName()), String.format("合同[%s]采购员为空", contractNo));
AssertUtils.isNotEquals(HGConstant.CgContractStatus.S_0, dbCg002.getStatus(),
String.format("合同[%s]状态不是\"待审核\"，不允许操作", contractNo));
AssertUtils.isTrue(fCg002.getAmount().compareTo(BigDecimal.ZERO) <= 0, String.format("合同[%s]不含税金额小于等于0，不允许操作", contractNo));
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010.java
......@@ -10,6 +10,8 @@ import com.baosight.hggp.hg.cw.domain.*;
import com.baosight.hggp.hg.cw.domain.HGCW010;
import com.baosight.hggp.hg.cw.tools.HGCWTools;
import com.baosight.hggp.hg.cw.vo.UserVO;
import com.baosight.hggp.hg.sb.domain.HGSB001;
import com.baosight.hggp.hg.sb.tools.HGSBTools;
import com.baosight.hggp.hg.sc.domain.HGSC001;
import com.baosight.hggp.hg.sc.tools.HGSCTools;
import com.baosight.hggp.hg.xs.domain.Company;
......@@ -45,8 +47,14 @@ public class ServiceHGCW010 extends ServiceBase {
@OperationLogAnnotation(operModul = "销售开票",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID,
DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
/*CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID,
DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);*/
List<String> roleCompanyCode = HGSBTools.getRoleCompanyCode();
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID),
new HashMap<String,Object>(){{
put(HGSB001.FIELD_COMPANY_CODES,roleCompanyCode);
}}
);
EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW010().eiMetadata);
} catch (Exception e) {
......
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW010.xml
......@@ -45,7 +45,7 @@
COMPANY_NAME = #companyName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="projName">
PROJ_NAME = #projName#
PROJ_NAME like CONCAT('%',#projName#,'%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="projCode">
PROJ_CODE = #projCode#
......
src/main/java/com/baosight/hggp/hg/kc/sql/HGKC010.xml
......@@ -251,11 +251,22 @@
<!--仓库公司下拉框-->
<select id="queryWhCodeBox" resultClass="java.util.HashMap">
SELECT distinct
COMPANY_CODE as "companyCode", <!-- 公司编码 -->
COMPANY_NAME as "companyName", <!-- 公司名称 -->
WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName" <!-- 仓库名称 -->
FROM ${hggpSchema}.HGKC010
A.COMPANY_CODE as "companyCode",
A.COMPANY_NAME as "companyName",
A.WH_CODE as "whCode",
A.WH_NAME as "whName",
B.wh_Type as "whType",
B.WH_TYPE_NAME as "whTypeName"
FROM ${hggpSchema}.HGKC010 A
left join (
select distinct
A.WH_CODE,
A.WH_NAME,
B.WH_TYPE,
B.WH_TYPE_NAME
FROM ${hggpSchema}.HGPZ007 A
INNER JOIN ${hggpSchema}.HGPZ006 B on A.WH_TYPE = B.WH_TYPE
) B on A.WH_CODE = B.wh_Code
WHERE 1=1
<include refid="condition"/>
</select>
......
src/main/java/com/baosight/hggp/hg/pz/tools/HGPZTools.java
......@@ -134,6 +134,20 @@ public class HGPZTools {
}
public static class HgPz006 {
public static HGPZ006 getWhCode(String wHCode) {
HGPZ007 pz007 = HGPZTools.HgPz007.get(wHCode);
if (pz007 == null) {
return null;
}
Map queryMap = new HashMap();
queryMap.put(HGPZ006.FIELD_WH_TYPE, pz007.getWhType());
List<HGPZ006> results = DaoBase.getInstance().query(HGPZ006.QUERY, queryMap);
return CollectionUtils.isEmpty(results) ? null : results.get(0);
}
}
/**
* 仓库管理
* HPPZ007 公共DAO定义
......
src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml
......@@ -316,12 +316,14 @@
<select id="queryCompany" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
select DISTINCT
a.ORG_ENAME as "orgEname",
a.ORG_CNAME as "orgCname"
a.ORG_CNAME as "orgCname",
a.PARENT_ORG_ID as "parentOrgId",
a.ORG_TYPE as "orgType"
from ${platSchema}.txsog01 a
<isNotEmpty property="userId">
left join ${platSchema}.txsog02 b on a.ORG_ID = b.ORG_ID
</isNotEmpty>
where a.IS_DELETED = 0
where a.IS_DELETED = 0 AND A.PARENT_ORG_ID NOT IN ('root')
<isNotEmpty prepend=" AND " property="accountCode">
a.ACCOUNT_CODE = #accountCode#
</isNotEmpty>
......
src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001.java
......@@ -9,6 +9,7 @@ import com.baosight.hggp.core.dao.DaoBase;
import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.core.enums.OrgTypeEnum;
import com.baosight.hggp.core.security.UserSessionUtils;
import com.baosight.hggp.core.tools.Iplat4jTools;
import com.baosight.hggp.core.utils.Iplat4jUtils;
import com.baosight.hggp.hg.constant.HGConstant;
import com.baosight.hggp.hg.cw.domain.HGCW999;
......@@ -89,6 +90,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
}
DaoUtils.update("HGCW999.deleteMatId", map1); //删除附件记录
DaoUtils.update(HGWD001A.DELETE_MAT_ID, map1); //删除变更记录
hgwd001.setStatus(HgWdConstant.FileStatus.S_0);
DaoUtils.update(HGWD001.DELETE, hgwd001);
}
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
......@@ -106,14 +108,16 @@ public class ServiceHGWD001 extends ServiceEPBase {
public EiInfo save(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
List<Map<String, Object>> edcm01List = Iplat4jTools.EdCm01.list("hggp.hgwd.fileType");
// 写入数据
for (Map resultRow : resultRows) {
HGWD001 hgwd001 = new HGWD001();
hgwd001.fromMap(resultRow);
hgwd001.setStatus(HgWdConstant.FileStatus.S_0);
if (hgwd001.getId() == null || hgwd001.getId() == 0) {
this.add(hgwd001);
} else {
this.modify(hgwd001);
this.modify(hgwd001,edcm01List);
}
}
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
......@@ -146,7 +150,7 @@ public class ServiceHGWD001 extends ServiceEPBase {
/**
* 修改操作
*/
public void modify(HGWD001 hgwd001) {
public void modify(HGWD001 hgwd001,List<Map<String, Object>> edcm01List) {
HGWD001 wd001 =HGWDTools.HgWd001.get(hgwd001.getId());
HGWD001A hgwd001a = new HGWD001A();
hgwd001a.setCompanyCode(hgwd001.getCompanyCode());
......@@ -161,9 +165,11 @@ public class ServiceHGWD001 extends ServiceEPBase {
hgwd001a.setChangeEnd(hgwd001.getFileName());
HGWDTools.HgWd001.add(hgwd001a);
}else if (wd001 != null && !wd001.getFileType().equals(hgwd001.getFileType())){
List<Map> fileType1 = edcm01List.stream().filter(map -> map.get("itemCode").equals(wd001.getFileType())).collect(Collectors.toList());
List<Map> fileType2 = edcm01List.stream().filter(map -> map.get("itemCode").equals(hgwd001.getFileType())).collect(Collectors.toList());
hgwd001a.setChangeContent("文件类型");
hgwd001a.setChangeStart(wd001.getFileType());
hgwd001a.setChangeEnd(hgwd001.getFileType());
hgwd001a.setChangeStart(fileType1.get(0).get("itemCname").toString());
hgwd001a.setChangeEnd(fileType2.get(0).get("itemCname").toString());
HGWDTools.HgWd001.add(hgwd001a);
}
......
src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD099.java
......@@ -8,6 +8,7 @@ import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.hg.cw.domain.HGCW999;
import com.baosight.hggp.hg.cw.tools.HGCWTools;
import com.baosight.hggp.hg.ds.domain.HGDS002;
import com.baosight.hggp.hg.wd.constant.HgWdConstant;
import com.baosight.hggp.hg.wd.domain.HGWD001;
import com.baosight.hggp.hg.wd.domain.HGWD001A;
import com.baosight.hggp.hg.wd.tools.HGWDTools;
......@@ -133,6 +134,8 @@ public class ServiceHGWD099 extends ServiceEPBase {
hgwd001a.setChangeStart(fSc002A.getDocId());
hgwd001a.setMatId(hgwd001.getId());
HGWDTools.HgWd001.add(hgwd001a);
hgwd001.setStatus(HgWdConstant.FileStatus.S_0);
HGWDTools.HgWd001.updateStatus(hgwd001);
}
}
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
......@@ -155,12 +158,12 @@ public class ServiceHGWD099 extends ServiceEPBase {
try {
Long matId = null;
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < resultRows.size(); i++) {
for (Map resultRow : resultRows) {
HGCW999 fSc002A = new HGCW999();
fSc002A.fromMap(resultRows.get(i));
fSc002A.fromMap(resultRow);
matId = fSc002A.getMatId();
this.deleteEntity(fSc002A);
HGWD001 hgwd001 =HGWDTools.HgWd001.get(matId);
HGWD001 hgwd001 = HGWDTools.HgWd001.get(matId);
if (hgwd001 != null) {
HGWD001A hgwd001a = new HGWD001A();
hgwd001a.setCompanyCode(hgwd001.getCompanyCode());
......@@ -173,6 +176,8 @@ public class ServiceHGWD099 extends ServiceEPBase {
hgwd001a.setChangeStart(fSc002A.getDocId());
hgwd001a.setMatId(hgwd001.getId());
HGWDTools.HgWd001.add(hgwd001a);
hgwd001.setStatus(HgWdConstant.FileStatus.S_0);
HGWDTools.HgWd001.updateStatus(hgwd001);
}
}
//List<HGCW999> hgcw999List = HGCWTools.HgCw999.queryByBiz(matId,"HT");
......
src/main/java/com/baosight/hggp/hg/wd/sql/HGWD001.xml
......@@ -167,6 +167,14 @@
WHERE ID = #id#
</update>
<update id="updateStatus">
UPDATE ${hggpSchema}.HGWD001
SET
STATUS = #status#, <!-- 状态 -->
<include refid="SqlBase.updateRevise"/>
WHERE ID = #id#
</update>
<update id="updateReleaseDate">
UPDATE ${hggpSchema}.HGWD001
SET
......
src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java
......@@ -53,7 +53,11 @@ public class HGWDTools {
AssertUtils.isNull(hgwd001a, "文档对象不能为空");
DaoUtils.insert(HGWD001A.INSERT, hgwd001a);
}
public static void updateStatus(HGWD001 hgwd001) {
AssertUtils.isNull(hgwd001, "文档对象不能为空");
DaoUtils.update("HGWD001.updateStatus", hgwd001);
}
}
......
src/main/java/com/baosight/hggp/hg/yx/domain/HGYX001.java
......@@ -48,7 +48,7 @@ public class HGYX001 extends DaoEPBase {
public static final String FIELD_RECE_NAME = "receName"; /* 收货方名称*/
public static final String FIELD_RECE_ADDR = "receAddr"; /* 收货地址*/
public static final String FIELD_RECE_USER_PHONE = "receUserPhone"; /* 收货人电话*/
public static final String FIELD_TRAN_TYPE = "tranType"; /* 运输方式*/
public static final String FIELD_TRAN_TYPE = "tranType"; /* 车辆性质*/
public static final String FIELD_NUM_PLATE = "numPlate"; /* 车号*/
public static final String FIELD_CONS_QUANTITY = "consQuantity"; /* 发货数量*/
public static final String FIELD_CONS_WEIGHT = "consWeight"; /* 发货重量*/
......@@ -79,7 +79,7 @@ public class HGYX001 extends DaoEPBase {
public static final String COL_RECE_NAME = "RECE_NAME"; /* 收货方名称*/
public static final String COL_RECE_ADDR = "RECE_ADDR"; /* 收货地址*/
public static final String COL_RECE_USER_PHONE = "RECE_USER_PHONE"; /* 收货人电话*/
public static final String COL_TRAN_TYPE = "TRAN_TYPE"; /* 运输方式*/
public static final String COL_TRAN_TYPE = "TRAN_TYPE"; /* 车辆性质*/
public static final String COL_NUM_PLATE = "NUM_PLATE"; /* 车号*/
public static final String COL_CONS_QUANTITY = "CONS_QUANTITY"; /* 发货数量*/
public static final String COL_CONS_WEIGHT = "CONS_WEIGHT"; /* 发货重量*/
......@@ -119,7 +119,7 @@ public class HGYX001 extends DaoEPBase {
private String receName = " "; /* 收货方名称*/
private String receAddr = " "; /* 收货地址*/
private String receUserPhone = " "; /* 收货人电话*/
private Integer tranType = 0; /* 运输方式*/
private Integer tranType = 0; /* 车辆性质*/
private String numPlate = " "; /* 车号*/
private BigDecimal consQuantity = new BigDecimal("0"); /* 发货数量*/
private BigDecimal consWeight = new BigDecimal("0"); /* 发货重量*/
......@@ -233,7 +233,7 @@ public class HGYX001 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_TRAN_TYPE);
eiColumn.setDescName("运输方式");
eiColumn.setDescName("车辆性质");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_NUM_PLATE);
......@@ -669,7 +669,7 @@ public class HGYX001 extends DaoEPBase {
this.receUserPhone = receUserPhone;
}
/**
* get the tranType - 运输方式.
* get the tranType - 车辆性质.
* @return the tranType
*/
public Integer getTranType() {
......@@ -677,9 +677,9 @@ public class HGYX001 extends DaoEPBase {
}
/**
* set the tranType - 运输方式.
* set the tranType - 车辆性质.
*
* @param tranType - 运输方式
* @param tranType - 车辆性质
*/
public void setTranType(Integer tranType) {
this.tranType = tranType;
......
src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001C.java
......@@ -7,8 +7,11 @@ import com.baosight.hggp.hg.cw.tools.HGCWTools;
import com.baosight.hggp.hg.cw.vo.UserVO;
import com.baosight.hggp.hg.kc.domain.HGKC010;
import com.baosight.hggp.hg.pz.domain.HGPZ004;
import com.baosight.hggp.hg.pz.domain.HGPZ006;
import com.baosight.hggp.hg.pz.tools.HGPZTools;
import com.baosight.hggp.hg.sb.domain.HGSB001;
import com.baosight.hggp.hg.sb.tools.HGSBTools;
import com.baosight.hggp.hg.sc.domain.HGSC004;
import com.baosight.hggp.hg.yx.domain.HGYX001;
import com.baosight.hggp.hg.yx.domain.HGYX001C;
import com.baosight.hggp.util.CommonMethod;
......@@ -21,6 +24,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
/**
* @author LiuYang
......@@ -36,7 +40,16 @@ public class ServiceHGYX001C extends ServiceEPBase {
String[] specIdArray = specIds.split(",");
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "specIds", specIdArray);
}
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeTwo());
String whcode = inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGKC010.FIELD_WH_CODE);
if (StringUtils.isNotEmpty(whcode)) {
HGPZ006 hgpz006 = HGPZTools.HgPz006.getWhCode(whcode);
if (Objects.nonNull(hgpz006)){
if ("耗材".equals(hgpz006.getWhTypeName()) || "原材料".equals(hgpz006.getWhTypeName())) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSC004.FIELD_proj_code, null);
}
}
}
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
inInfo = super.query(inInfo, HGYX001C.QUERY, new HGYX001C());
CommonMethod.initBlock(inInfo,
Arrays.asList(
......@@ -44,7 +57,7 @@ public class ServiceHGYX001C extends ServiceEPBase {
DdynamicEnum.INVENT_RECORD_BLOCK_ID,
DdynamicEnum.SPEC_NAME_BLOCK_ID),
new HashMap<String, Object>(){{
put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeTwo());
put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
}});
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGYX001C().eiMetadata);
......@@ -54,7 +67,7 @@ public class ServiceHGYX001C extends ServiceEPBase {
@Override
public EiInfo query(EiInfo inInfo) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getInentTypeTwo());
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
return super.query(inInfo, HGYX001C.QUERY,new HGYX001C());
}
}
src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001.xml
......@@ -65,7 +65,7 @@
RECE_NAME as "receName", <!-- 收货方名称 -->
RECE_ADDR as "receAddr", <!-- 收货地址 -->
RECE_USER_PHONE as "receUserPhone", <!-- 收货人电话 -->
TRAN_TYPE as "tranType", <!-- 运输方式 -->
TRAN_TYPE as "tranType", <!-- 车辆性质 -->
NUM_PLATE as "numPlate", <!-- 车号 -->
CONS_QUANTITY as "consQuantity", <!-- 发货数量 -->
CONS_WEIGHT as "consWeight", <!-- 发货重量 -->
......@@ -307,7 +307,7 @@
RECE_NAME, <!-- 收货方名称 -->
RECE_ADDR, <!-- 收货地址 -->
RECE_USER_PHONE, <!-- 收货人电话 -->
TRAN_TYPE, <!-- 运输方式 -->
TRAN_TYPE, <!-- 车辆性质 -->
NUM_PLATE, <!-- 车号 -->
CONS_QUANTITY, <!-- 发货数量 -->
CONS_WEIGHT, <!-- 发货重量 -->
......@@ -360,7 +360,7 @@
RECE_NAME = #receName#, <!-- 收货方名称 -->
RECE_ADDR = #receAddr#, <!-- 收货地址 -->
RECE_USER_PHONE = #receUserPhone#, <!-- 收货人电话 -->
TRAN_TYPE = #tranType#, <!-- 运输方式 -->
TRAN_TYPE = #tranType#, <!-- 车辆性质 -->
NUM_PLATE = #numPlate#, <!-- 车号 -->
CONS_QUANTITY = #consQuantity#, <!-- 发货数量 -->
CONS_WEIGHT = #consWeight#, <!-- 发货重量 -->
......
src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001C.xml
......@@ -122,6 +122,25 @@
FROM ${hggpSchema}.HGKC010
WHERE 1=1 AND INV_QTY >0
<include refid="condition"/>
<isNotEmpty prepend=" AND " property="projCode">
INVENT_CODE IN (
SELECT distinct trim(product_code)
FROM ${hggpSchema}.HGSC004A
WHERE PROJ_CODE = #projCode#
<isNotEmpty prepend=" AND " property="productStatus">
product_status = #productStatus#
</isNotEmpty>
<isEmpty prepend=" AND " property="productStatus">
product_status = '1'
</isEmpty>
<isNotEmpty prepend=" AND " property="approvalStatus">
approval_status = #approvalStatus#
</isNotEmpty>
<isEmpty prepend=" AND " property="approvalStatus">
approval_status = '1'
</isEmpty>
)
</isNotEmpty>
<include refid="orderBy"/>
</select>
......
src/main/java/com/baosight/iplat4j/core/security/PlatServiceValidateFilter.java
......@@ -82,7 +82,9 @@ public class PlatServiceValidateFilter implements Filter {
// modify by songx at 20240826 if条件去掉authed，否则token会串
if (this.iTokenValidateFilter != null) {
this.iTokenValidateFilter.doFilter(httpServletRequest, httpServletResponse);
authed = this.isAuthedByJwt(httpServletRequest);
if (!authed) {
authed = this.isAuthedByJwt(httpServletRequest);
}
}
Map headerMap = new HashMap();
......
src/main/webapp/HG/CG/HGCG001.jsp
......@@ -15,12 +15,11 @@
filter="contains" optionLabel="全部" defultValue="">
<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
</EF:EFSelect>
<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3" placeholder="模糊查询项目名称"/>
<EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部"
defultValue="">
<EF:EFCodeOption codeName="hggp.hgcg.planStatus" condition="ITEM_CODE IN ('0', '2', '4')"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFSelect cname="数据来源" blockId="inqu_status" ename="source" row="0" colWidth="3" optionLabel="全部"
defultValue="">
<EF:EFCodeOption codeName="hggp.hpcg.receiveSource"/>
......
src/main/webapp/HG/CG/HGCG002.jsp
......@@ -16,12 +16,11 @@
defultValue="">
<EF:EFCodeOption codeName="hggp.hgcg.contractStatus" condition="ITEM_CODE IN ('0','2','4','5')"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
filter="contains" optionLabel="全部" defultValue="">
<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
</EF:EFSelect>
<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3" placeholder="模糊查询项目名称"/>
<EF:EFSelect cname="供应商名称" blockId="inqu_status" ename="supCode" row="0" colWidth="3"
filter="contains" optionLabel="全部" defultValue="">
<EF:EFOptions blockId="sup_record_block_id" textField="textField" valueField="valueField"/>
......@@ -30,8 +29,6 @@
startName="createdTimeFrom" endName="createdTimeTo" row="0" role="datetime"
format="yyyy-MM-dd HH:mm:ss" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
</div>
<div class="row">
<EF:EFSelect cname="数据来源" blockId="inqu_status" ename="source" row="0" colWidth="3" optionLabel="全部"
defultValue="">
<EF:EFCodeOption codeName="hggp.hpcg.receiveSource"/>
......
src/main/webapp/HG/CG/HGCG003.jsp
......@@ -16,13 +16,11 @@
defultValue="">
<EF:EFCodeOption codeName="hggp.hgcg.receiveStatus"/>
</EF:EFSelect>
</div>
<div class="row">
<EF:EFSelect cname="公司名称" blockId="inqu_status" ename="companyCode" row="0" colWidth="3"
filter="contains" optionLabel="全部" defultValue="">
<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
</EF:EFSelect>
<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3" placeholder="模糊查询项目名称"/>
<EF:EFSelect cname="供应商名称" blockId="inqu_status" ename="supCode" row="0" colWidth="3"
filter="contains" optionLabel="全部" defultValue="">
<EF:EFOptions blockId="sup_record_block_id" textField="textField" valueField="valueField"/>
......@@ -31,8 +29,6 @@
defultValue="">
<EF:EFCodeOption codeName="hggp.hpcg.receiveSource"/>
</EF:EFSelect>
</div>
<div>
<EF:EFDateSpan startCname="创建时间(从)" endCname="至" blockId="inqu_status"
startName="createdTimeFrom" endName="createdTimeTo" row="0" role="datetime"
format="yyyy-MM-dd HH:mm:ss" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
......
src/main/webapp/HG/CW/HGCW010.jsp
......@@ -14,16 +14,21 @@
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
</EF:EFSelect>
<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3" placeholder="模糊查询项目名称"/>
<%--<EF:EFSelect blockId="inqu_status" row="0" ename="projCode" cname="项目名称" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="proj_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>--%>
<EF:EFDateSpan startCname="开票日期(从)" endCname="至" blockId="inqu_status"
startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
<EF:EFInput cname="客户名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="客户名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" placeholder="模糊查询客户名称"/>
<EF:EFSelect cname="票据类型" ename="inqu_status-0-billTybe" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hggp.cw.billTybe"/>
</EF:EFSelect>
<EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" placeholder="模糊查询发票号"/>
<EF:EFSelect cname="开票状态" ename="inqu_status-0-billState" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hggp.cw.billState"/>
......
src/main/webapp/HG/WD/HGWD001.js
......@@ -42,6 +42,11 @@ $(function () {
}, {
field: "companyCode",
title: "公司名称",
filter: function (option) {
return _.filter(option.values, function (item) {
return item["param1Field"]!="root";
})
},
template: function (dataItem) {
for (let i = 0; i < companyCodeBox.length; i++) {
if (companyCodeBox[i]['valueField'] === dataItem['companyCode']){
......
src/main/webapp/HG/YX/HGYX001.jsp
......@@ -22,7 +22,7 @@
<EF:EFInput blockId="inqu_status" row="0" ename="projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
<EF:EFInput blockId="inqu_status" row="0" ename="deliveryCode" cname="发货单号" placeholder="模糊查询" colWidth="3"/>
<EF:EFInput blockId="inqu_status" row="0" ename="outboundCode" cname="出库单号" placeholder="模糊查询" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="tranType" cname="运输方式" colWidth="3" filter="contains">
<EF:EFSelect blockId="inqu_status" row="0" ename="tranType" cname="车辆性质" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hggp.hgyx.tranType"/>
</EF:EFSelect>
......@@ -65,7 +65,7 @@
</EF:EFComboColumn>
<EF:EFColumn ename="receAddr" cname="收货地址" enable="true" readonly="true" width="200" align="center"/>
<EF:EFColumn ename="receUserPhone" cname="收货人电话" enable="true" readonly="true" width="120" align="center" data-rules="mobile_phone"/>
<EF:EFComboColumn ename="tranType" cname="运输方式" width="80" align="center" enable="true" readonly="true" required="true">
<EF:EFComboColumn ename="tranType" cname="车辆性质" width="150" align="center" enable="true" readonly="true" required="true">
<EF:EFCodeOption codeName="hggp.hgyx.tranType"/>
</EF:EFComboColumn>
<EF:EFColumn ename="numPlate" cname="车牌号" enable="true" readonly="true" width="120" align="center"/>
......
src/main/webapp/HG/YX/HGYX001A.js
......@@ -375,11 +375,17 @@ function detail() {
ids.push(item.inventRecordId)
});
}
let projCode = $("#inqu_status-0-projCode").val();
if(isBlank(projCode)){
message("请选择项目!");
return false;
}
let consCode = $("#inqu_status-0-consCode").val();
if(isBlank(consCode)){
message("请选择发货方!");
return false;
}
let consWhCode = $("#inqu_status-0-consWhCode").val();
if(isBlank(consWhCode)){
message("请选择发货仓库!");
......@@ -387,7 +393,7 @@ function detail() {
}
JSColorbox.open({
href: "HGYX001C?methodName=initLoad&inqu_status-0-companyCode="+consCode+"&inqu_status-0-whCode="+consWhCode+"&inqu_status-0-specIds="+ids.join(','),
href: "HGYX001C?methodName=initLoad&inqu_status-0-companyCode="+consCode+"&inqu_status-0-projCode="+projCode+"&inqu_status-0-whCode="+consWhCode+"&inqu_status-0-specIds="+ids.join(','),
title: "<div style='text-align: center;'>选择发货明细</div>",
width: "90%",
height: "80%",
......
src/main/webapp/HG/YX/HGYX001A.jsp
......@@ -50,7 +50,7 @@
<div class="row">
<EF:EFInput blockId="inqu_status" row="0" ename="receAddr" cname="收货地址" placeholder="请输入收货地址" required="true" colWidth="3"/>
<EF:EFInput blockId="inqu_status" row="0" ename="receUserPhone" cname="收货人电话" required="true" data-rules="mobile_phone" placeholder="请输入电话号码" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="tranType" cname="运输方式" required="true" placeholder="请选择运输方式" colWidth="3" filter="contains">
<EF:EFSelect blockId="inqu_status" row="0" ename="tranType" cname="车辆性质" required="true" placeholder="请选择运输方式" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hggp.hgyx.tranType"/>
</EF:EFSelect>
......
src/main/webapp/HG/YX/HGYX001B.jsp
......@@ -50,7 +50,7 @@
<div class="row">
<EF:EFInput blockId="inqu_status" row="0" ename="receAddr" cname="收货地址" disabled="true" placeholder="请输入收货地址" required="true" colWidth="3"/>
<EF:EFInput blockId="inqu_status" row="0" ename="receUserPhone" cname="收货人电话" disabled="true" required="true" data-rules="mobile_phone" placeholder="请输入电话号码" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="tranType" cname="运输方式" disabled="true" required="true" placeholder="请选择运输方式" colWidth="3" filter="contains">
<EF:EFSelect blockId="inqu_status" row="0" ename="tranType" cname="车辆性质" disabled="true" required="true" placeholder="请选择运输方式" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hggp.hgyx.tranType"/>
</EF:EFSelect>
......
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