Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002.java

@@ -11,6 +11,7 @@ import com.baosight.hggp.hg.cg.tools.HGCGTools;
 import com.baosight.hggp.hg.cg.utils.HGCGUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
+import com.baosight.hggp.hg.xs.domain.User;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
@@ -46,8 +47,9 @@ public class ServiceHGCG002 extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
+			EiInfoUtils.addBlock(inInfo,"userByCompany", UserSessionUtils.getUserByCompany(UserSessionUtils.getAccountCode()), User.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG002().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002A.java

@@ -4,11 +4,14 @@ import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.DeleteFlagEnum;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cg.domain.HGCG001;
 import com.baosight.hggp.hg.cg.domain.HGCG002;
 import com.baosight.hggp.hg.cg.tools.HGCGTools;
 import com.baosight.hggp.hg.cg.utils.HGCGUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.sc.domain.HGSC001;
+import com.baosight.hggp.hg.xs.domain.User;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.BeanUtils;
 import com.baosight.hggp.util.CommonMethod;
@@ -32,7 +35,7 @@ import java.util.Map;
  * @date:2024/5/9,11:04
  */
 public class ServiceHGCG002A extends ServiceBase {
-	
+
 	/**
 	 * 画面初始化
 	 *
@@ -47,13 +50,14 @@ public class ServiceHGCG002A extends ServiceBase {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
+			EiInfoUtils.addBlock(inInfo,"userByCompany", UserSessionUtils.getUserByCompany(UserSessionUtils.getAccountCode()), User.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG001().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 查询操作
 	 *
@@ -74,7 +78,7 @@ public class ServiceHGCG002A extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 确认操作.
 	 *
@@ -100,7 +104,7 @@ public class ServiceHGCG002A extends ServiceBase {
 		}
 		return inInfo;
 	}
-	
+
 	/**
 	 * 数据校验
 	 *
@@ -116,7 +120,7 @@ public class ServiceHGCG002A extends ServiceBase {
 					String.format("计划[%s]状态不是\"审核通过\"，不允许操作", planNo));
 		}
 	}
-	
+
 	/**
 	 * 数据保存
 	 *
@@ -139,8 +143,8 @@ public class ServiceHGCG002A extends ServiceBase {
 			HGCGTools.HgCg001.updateStatus(planNo, HGConstant.CgPlanStatus.S_4);
 		}
 	}
-	
-	
+
+
 	/**
 	 * 锁并且获取数据
 	 *

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002A.java

@@ -3,12 +3,14 @@ package com.baosight.hggp.hg.cw.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cw.domain.HGCW002;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
 import com.baosight.hggp.hg.pz.domain.HGPZ002;
 import com.baosight.hggp.hg.pz.domain.HGPZ003;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
@@ -71,24 +73,15 @@ public class ServiceHGCW002A extends ServiceBase {
 					});
 				}
 			} else if (contractCategory.equals("2")) {
-				List<Org> orgList = HGXSTools.XsOrg.queryByUser();
-				if (CollectionUtils.isNotEmpty(orgList)) {
-					Org org = orgList.get(0);
-					if (!org.getOrgType().equals("company")) {
-						//如果不是公司公司，则找到上一级
-						Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
-						UserVO userVO = new UserVO();
-						userVO.setUsercode(org1.getOrgId());
-						userVO.setUsername(org1.getOrgCname());
-						userVOList.add(userVO);
-					} else {
-						UserVO userVO = new UserVO();
-						userVO.setUsercode(org.getOrgId());
-						userVO.setUsername(org.getOrgCname());
-						userVOList.add(userVO);
+				List<Company> list = UserSessionUtils.getRoleCompany();
+				for (Company c:list) {
+					UserVO userVO = new UserVO();
+					userVO.setUsercode(c.getCompanyCode());
+					userVO.setUsername(c.getCompanyName());
+					userVOList.add(userVO);
 					}
 				}
-			}
+
 			inInfo.addBlock("partyAResult").addRows(userVOList);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "甲方名称查询失败");
@@ -106,24 +99,15 @@ public class ServiceHGCW002A extends ServiceBase {
 			List<UserVO> userVOList = new ArrayList<>();
 			String contractCategory = inInfo.getString("contractCategory");
 			if (contractCategory.equals("1")) {
-				List<Org> orgList = HGXSTools.XsOrg.queryByUser();
-				if (CollectionUtils.isNotEmpty(orgList)) {
-					Org org = orgList.get(0);
-					if (!org.getOrgType().equals("company")) {
-						//如果不是公司公司，则找到上一级
-						Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
-						UserVO userVO = new UserVO();
-						userVO.setUsercode(org1.getOrgId());
-						userVO.setUsername(org1.getOrgCname());
-						userVOList.add(userVO);
-					} else {
-						UserVO userVO = new UserVO();
-						userVO.setUsercode(org.getOrgId());
-						userVO.setUsername(org.getOrgCname());
-						userVOList.add(userVO);
-					}
+				List<Company> list = UserSessionUtils.getRoleCompany();
+				for (Company c:list) {
+					UserVO userVO = new UserVO();
+					userVO.setUsercode(c.getCompanyCode());
+					userVO.setUsername(c.getCompanyName());
+					userVOList.add(userVO);
 				}
-			} else if (contractCategory.equals("2")) {
+			}
+			else if (contractCategory.equals("2")) {
 				List<HGPZ003> hgpz003List = HGCWTools.HgCw002.list(1);
 				if (CollectionUtils.isNotEmpty(hgpz003List)) {
 					hgpz003List.forEach(hgpz003 -> {

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW006A.java

@@ -2,11 +2,14 @@ package com.baosight.hggp.hg.cw.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cw.domain.HGCW006;
+import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
 import com.baosight.hggp.hg.pz.domain.HGPZ002;
 import com.baosight.hggp.hg.pz.domain.HGPZ003;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.CommonMethod;
@@ -61,16 +64,13 @@ public class ServiceHGCW006A extends ServiceBase {
 				Org org = orgList.get(0);
 				if (!org.getOrgType().equals("company")) {
 					//如果不是公司公司，则找到上一级
-					Org org1 = HGXSTools.XsOrg.queryCompany(org.getOrgId());
-					UserVO userVO = new UserVO();
-					userVO.setUsercode(org1.getOrgId());
-					userVO.setUsername(org1.getOrgCname());
-					userVOList.add(userVO);
-				} else {
-					UserVO userVO = new UserVO();
-					userVO.setUsercode(org.getOrgId());
-					userVO.setUsername(org.getOrgCname());
-					userVOList.add(userVO);
+					List<Company> list = UserSessionUtils.getRoleCompany();
+					for (Company c:list) {
+						UserVO userVO = new UserVO();
+						userVO.setUsercode(c.getCompanyCode());
+						userVO.setUsername(c.getCompanyName());
+						userVOList.add(userVO);
+					}
 				}
 			}
 			inInfo.addBlock("partyAResult").addRows(userVOList);
@@ -79,5 +79,28 @@ public class ServiceHGCW006A extends ServiceBase {
 		}
 		return inInfo;
 	}
-
+	/**
+	 * 乙方名称查询
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo partyBQuery(EiInfo inInfo) {
+		try {
+			List<UserVO> userVOList = new ArrayList<>();
+			String contractCategory = inInfo.getString("contractCategory");
+				List<HGPZ003> hgpz003List = HGCWTools.HgCw002.list(1);
+				if (CollectionUtils.isNotEmpty(hgpz003List)) {
+					hgpz003List.forEach(hgpz003 -> {
+						UserVO userVO = new UserVO();
+						userVO.setUsercode(hgpz003.getSupCode());
+						userVO.setUsername(hgpz003.getSupName());
+						userVOList.add(userVO);
+					});
+				}
+			inInfo.addBlock("partyAResult").addRows(userVOList);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "乙方名称查询失败");
+		}
+		return inInfo;
+	}
 }

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC007A.java

@@ -141,7 +141,7 @@ public class ServiceHGKC007A extends ServiceBase {
 		AssertUtils.isEmpty(UserSessionUtils.getAccountCode(), "当前用户未绑定公司，无法操作数据，请联系管理员！");
 		AssertUtils.isEmpty(UserSessionUtils.getOrgId(), "当前用户未绑定部门，无法操作数据，请联系管理员！");
 		AssertUtils.isNull(hgkc007a.getPrimaryId(), "未获取到其他出库单ID信息");
-		HGKC010 hgkc010 = HGKCTools.HgKc010.get(hgkc007a.getCompanyCode(),hgkc007a.getWhCode(),hgkc007a.getPartCode());
+		HGKC010 hgkc010 = HGKCTools.HgKc010.get(hgkc007a.getCompanyCode(),hgkc007a.getWhCode(),hgkc007a.getInventCode());
 		if (hgkc010==null){
 			throw new PlatException("实时库存不存在！");
 		}

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC003.java

@@ -6,6 +6,7 @@ import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.sc.domain.HGSC003;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -27,13 +28,14 @@ public class ServiceHGSC003 extends ServiceBase {
     public EiInfo initLoad(EiInfo inInfo) {
         try {
             inInfo = super.query(inInfo, HGSC003.QUERY, new HGSC003());
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             Map map = new HashMap();
             map.put(HGSC003.FIELD_account_code, UserSessionUtils.getAccountCode());
             CommonMethod.initBlock(inInfo,
                     Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROJ_RECORD_BLOCK_ID),map,false
             );
-        } catch (PlatException e) {
-            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        } catch (Exception e){
+            LogUtils.setDetailMsg(inInfo,e,"初始化失败");
         }
         return inInfo;
     }

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC009.java

@@ -3,13 +3,14 @@ package com.baosight.hggp.hg.sc.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC009;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.*;
-import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -46,6 +47,11 @@ public class ServiceHGSC009 extends ServiceEPBase {
         List<String> orgIds = HGSBTools.getRoleCompanyCode();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        try {
+            EiInfoUtils.addBlock(outInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+        } catch (Exception e){
+            LogUtils.setDetailMsg(outInfo,e,"初始化失败");
+        }
         return outInfo;
     }
 

src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL001.java

@@ -19,6 +19,7 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -213,6 +214,8 @@ public class ServiceHGZL001 extends ServiceBase {
 			HGZL001 dbZl003 = dbZl001Map.get(checkNo);
 			AssertUtils.isNotEquals(CommonConstant.YesNo.NO_0, dbZl003.getStatus(),
 					String.format("质检单[%s]状态不是\"未处理\"，不允许操作", checkNo));
+			AssertUtils.isTrue(fZl001.getQualifyQty().compareTo(BigDecimal.ZERO) < 0 ,String.format("质检单[%s]的合格数量不能为负数", checkNo));
+			AssertUtils.isTrue(fZl001.getUnqualifyQty().compareTo(BigDecimal.ZERO) < 0 ,String.format("质检单[%s]的不合格数量不能为负数", checkNo));
 			AssertUtils.isNotEquals(fZl001.getQualifyQty().add(fZl001.getUnqualifyQty()), dbZl003.getReceiveQty(),
 					String.format("质检单[%s]的合格数量加不合格数量必须等于收货数量", checkNo));
 		}

src/main/webapp/HG/CG/HGCG002.js

 $(function () {
+	var userByCompany = __eiInfo.getBlock("userByCompany").getMappedRows();
 
 	IPLATUI.EFGrid = {
 		"result": {
@@ -7,7 +8,48 @@ $(function () {
 				pageSize: 20,
 				pageSizes: [20, 50, 70, 100],
 			},
-			columns: [],
+			columns: [
+				{
+					field: "purUserName",
+					template: function (dataItem) {
+						for (let i = 0; i < userByCompany.length; i++) {
+							let purUserName = dataItem['purUserName'];
+							if(purUserName){
+								if (userByCompany[i]['userName'] === purUserName.userName) {
+									return userByCompany[i]['userName'];
+								}
+							}
+						}
+						return dataItem["purUserName"];
+					},
+					editor: function (container, options) {
+						let inInfo = new EiInfo();
+						inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
+						inInfo.set("field", options.field);
+						EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
+							onSuccess: function (ei) {
+								userByCompany = ei.getBlock("userByCompany").getMappedRows();
+							},
+							onFail: function (ei) {
+							}
+						}, {async: false});
+						var input = $('<input />');
+						input.attr("name", options.field);
+						input.attr("id", options.field);
+						input.appendTo(container);
+						input.kendoDropDownList({
+							dataSource: userByCompany,
+							minLength: 0,
+							dataTextField: "userName",
+							dataValueField: "userName",
+							optionLabelTemplate: "[#:loginName#]#:userName#-#:depName#",
+							valueTemplate: "[#:loginName#]#:userName#-#:depName#",
+							template: "[#:loginName#]#:userName#-#:depName#",
+							filter: "contains"
+						});
+					}
+				}
+			],
 			beforeEdit: function (e) {
 				let item = e.model;
 				if(item.status != '0'){

src/main/webapp/HG/CG/HGCG002.jsp

@@ -69,7 +69,9 @@
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" enable="false"/>
 			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="price" cname="单价" width="80" align="right" format="{0:N3}" required="true"/>
-			<EF:EFColumn ename="taxRate" cname="税率(%)" width="80" align="right" format="{0:N3}" required="true"/>
+			<EF:EFComboColumn ename="taxRate" cname="税率(%)" enable="true" width="80" align="center" required="true">
+				<EF:EFCodeOption codeName="hggp.cw.taxPoints" />
+			</EF:EFComboColumn>
 			<EF:EFColumn ename="amount" cname="不含税金额" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="taxAmount" cname="税额" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="taxIncludeAmount" cname="含税金额" enable="false" width="80" align="right" format="{0:N3}"/>

src/main/webapp/HG/CG/HGCG002A.js

 $(function () {
+	var userByCompany = __eiInfo.getBlock("userByCompany").getMappedRows();
 	IPLATUI.EFGrid = {
 		"result": {
-			columns: [],
+			pageable:false,
+			columns: [
+				{
+					field: "purUserName",
+					template: function (dataItem) {
+						for (let i = 0; i < userByCompany.length; i++) {
+							let purUserName = dataItem['purUserName'];
+							if(purUserName){
+								if (userByCompany[i]['userName'] === purUserName.userName) {
+									return userByCompany[i]['userName'];
+								}
+							}
+						}
+						return "";
+					},
+					editor: function (container, options) {
+						let inInfo = new EiInfo();
+						inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
+						inInfo.set("field", options.field);
+						EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
+							onSuccess: function (ei) {
+								userByCompany = ei.getBlock("userByCompany").getMappedRows();
+							},
+							onFail: function (ei) {
+							}
+						}, {async: false});
+						var input = $('<input />');
+						input.attr("name", options.field);
+						input.attr("id", options.field);
+						input.appendTo(container);
+						input.kendoDropDownList({
+							dataSource: userByCompany,
+							minLength: 0,
+							dataTextField: "userName",
+							dataValueField: "userName",
+							optionLabelTemplate: "[#:loginName#]#:userName#-#:depName#",
+							valueTemplate: "[#:loginName#]#:userName#-#:depName#",
+							template: "[#:loginName#]#:userName#-#:depName#",
+							filter: "contains"
+						});
+					}
+				}
+			],
 			loadComplete: function (grid) {
 				grid.dataSource.bind("change", function (e) {
 					supCodeChange(e);
@@ -19,8 +62,11 @@ $(function () {
 	$("#CONFIRM").on("click", confirm);
 
 	downKeyUp();
+
 });
 
+
+
 /**
  * 页面加载时执行
  */
@@ -54,6 +100,8 @@ let confirm = function () {
 			message("勾选的第" + (i + 1) + "行采购员不能为空");
 			return;
 		}
+		let purUserName = rows[i]['purUserName'];
+		rows[i]['purUserName'] = purUserName.userName;
 	}
 	JSUtils.confirm("确定对勾选的[" + rows.length + "]条数据生成\"采购合同\"吗? ", {
 		ok: function () {

src/main/webapp/HG/CG/HGCG002A.jsp

@@ -45,7 +45,7 @@
 				<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="supName" cname="供应商名称" enable="false" width="100" align="center" hidden="true"/>
-			<EF:EFColumn ename="purUserName" cname="采购员" width="100" align="center" maxLength="100" required="true"/>
+			<EF:EFColumn ename="purUserName" cname="采购员" width="120" align="center" maxLength="100" required="true"/>
 			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center" hidden="true"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="sepcId" cname="规格ID" enable="false" width="120" align="center" hidden="true"/>

src/main/webapp/HG/CW/HGCW006A.js

@@ -126,6 +126,38 @@ $(function() {
                 IPLAT.EFPopupInput.text( $("#popupInputPartyA") , partyA)
                 e.preventDefault(); // 不使用默认的回填逻辑
             }
+        },"popupInputPartyB": {
+
+            /**
+             * EFGrid 查询时触发的事件，通常在此处，设置查询条件
+             * 注意: 必须返回一个EiInfo，作为初始查询条件
+             * 配置了query时，默认每次打开窗口都会进行一次查询
+             */
+            query: function (e) {
+                console.log("Step" + (++i) + ": ----query----");
+                // 将自定义div中的字段构造成查询条件 EiInfo
+                // var queryInfo = EiInfo.build("#result-0-contractCategory");
+                var info = new EiInfo();
+                return info;
+            },
+            /**
+             * grid中的数据回填时触发的事件
+             * @param e 回填数据事件
+             * e.sender 弹出窗口对象
+             * e.grid 弹出的grid对象
+             * e.model 选中的数据行model
+             */
+            backFill: function (e) {
+                console.log("Step" + (++i) + ": ----backFill----");
+                // 回填数据
+                var model = e.model;
+                // var data = model.toJSON();
+                console.log(model);
+                var partyB = model.usercode + "-" + model.username;
+                $("#result-0-partyB").val(partyB);
+                IPLAT.EFPopupInput.text( $("#popupInputPartyB") , partyB)
+                e.preventDefault(); // 不使用默认的回填逻辑
+            }
         }
     };
 

src/main/webapp/HG/CW/HGCW006A.jsp

@@ -31,7 +31,17 @@
                              resizable="true" popupTitle="甲方名称" popupWidth="400">
             </EF:EFPopupInput>
             <EF:EFInput ename="result-0-partyA" cname="甲方名称" type="hidden" />
-            <EF:EFInput ename="result-0-partyB" cname="乙方名称" colWidth="4" />
+            <EF:EFPopupInput ename="popupInputPartyB" cname="乙方名称" colWidth="4"
+                             serviceName="HGCW006A" methodName="partyBQuery"
+                             resultId="partyAResult"
+                             save="false" popupType="ServiceGrid"
+                             valueField="username" textField="username"
+                             columnEnames="username,usercode"
+                             columnCnames="名称,编码"
+                             readonly="true"
+                             resizable="true" popupTitle="乙方名称" popupWidth="400">
+            </EF:EFPopupInput>
+            <EF:EFInput ename="result-0-partyB" cname="乙方名称" type="hidden"/>
 
         </div>
         <div class="row">

src/main/webapp/HG/CW/HGCW010.js

@@ -25,7 +25,7 @@ $(function() {
         ],
         loadComplete: function (grid) {
             $("#SELECT_BILL").on("click",addFunc);
-            $("#BTN_UPDATE").on("click",updateFunc);
+            $("#SAVE").on("click",saveFunc);
             $("#SUBMIT").on("click",submitFunc);
             $("#BTN_BILL").on("click",billFunc);
 
@@ -74,25 +74,55 @@ function addFunc() {
 }
 
 /**
- * 修改
+ * 保存
  */
-function updateFunc() {
+function saveFunc() {
     let rows = resultGrid.getCheckedRows();
-    if (rows.length != 1) {
-        message("请选择一条数据");
+    if (rows.length < 1) {
+        message("请选择数据");
         return;
     }
-    if (rows[0].reviewStatus == "3") {
-        message("已经审核的单据不能修改");
-        return;
-    }
-    JSColorbox.open({
-        href: "HGCW010B?methodName=initLoad&inqu_status-0-mainId=" + rows[0].id + "&efParentFormEname=HGCW010",
-        title: "<div style='text-align: center;'>开票清单</div>",
-        width: "90%",
-        height: "90%",
-        callbackName: windowCallback
+    let flag = true;
+    $.each(rows, function(index, item) {
+        let reviewStatus= item.get("reviewStatus");
+        if((reviewStatus === "1")){
+            message("数据已审核");
+            flag = false;
+            return false;
+        }
     });
+    if(flag) {
+        JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+            ok: function () {
+                var info = new EiInfo();
+                info.addBlock(JSUtils.checkedRows2Block("result"));
+                EiCommunicator.send("HGCW010", "save", info, {
+                    onSuccess: function (ei) {
+                        if (ei.getStatus() >= 0) {
+                            try {
+                                query();
+                            } catch (e) {
+                                // TODO: handle exception
+                            }
+                            if (ei.getStatus() == 0) {
+                                NotificationUtil(ei, 'warning');
+                            } else {
+                                NotificationUtil(ei);
+                            }
+                        } else {
+                            NotificationUtil(ei, "error");
+                        }
+                    },
+                    onFail: function (ei) {
+                        // 发生异常
+                        NotificationUtil("操作失败，原因[" + ei + "]", "error");
+                    }
+                });
+                //JSUtils.submitGridsData("result", "HPSC001", "save", true);
+
+            }
+        });
+    }
 }
 
 
@@ -103,9 +133,18 @@ function windowCallback() {
     JSColorbox.close();
 }
 
-function contractDetailFunc(id) {
+function contractDetailFunc(id)  {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length != 1) {
+        message("请选择一条数据");
+        return;
+    }
+    if (rows[0].reviewStatus == "3") {
+        message("已经审核的单据不能修改");
+        return;
+    }
     JSColorbox.open({
-        href: "HGCW010C?methodName=initLoad&inqu_status-0-mainId=" + id + "&efParentFormEname=HGCW010",
+        href: "HGCW010B?methodName=initLoad&inqu_status-0-mainId=" + rows[0].id + "&efParentFormEname=HGCW010",
         title: "<div style='text-align: center;'>开票清单</div>",
         width: "90%",
         height: "90%",

src/main/webapp/HG/CW/HGCW010.jsp

@@ -37,7 +37,10 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="taxPoints" cname="税率" width="120" enable="false" readonly="true" align="center"/>
+            <EF:EFComboColumn ename="taxPoints" cname="税点" width="120" align="center" required="true"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
+                <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisSettlementTax" cname="税额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" enable="false" readonly="true" align="center"/>

src/main/webapp/HG/CW/HGCW010A.jsp

@@ -36,7 +36,7 @@
             <EF:EFColumn ename="thisPriceTax" cname="结算价税合计金额" hidden="true"/>
             <EF:EFColumn ename="thisSettlementTax" cname="结算税金" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisSettlementAmount" cname="结算金额" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="thisAmount" cname="本次结算金额" width="120" align="center"/>
+            <EF:EFColumn ename="thisAmount" cname="本次开票金额" width="120" align="center"/>
             <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" readonly="true" align="center"/>
 
 

src/main/webapp/HG/CW/HGCW010B.jsp

@@ -14,7 +14,7 @@
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="开款总额" width="120" format="{0:N3}" align="center"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>

src/main/webapp/HG/CW/HGCW010C.jsp

@@ -14,7 +14,7 @@
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="收款总额" width="120" format="{0:N3}" align="center" enable="false" readonly="true"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="开票总额" width="120" format="{0:N3}" align="center" enable="false" readonly="true"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>

src/main/webapp/HG/CW/HGCW052.jsp

@@ -14,8 +14,7 @@
             <EF:EFInput ename="inqu_status-0-companyCode" cname="公司编码" colWidth="3" type="hidden"/>
             <EF:EFInput ename="inqu_status-0-companyName" cname="公司名称" colWidth="3" readonly="true"/>
             <EF:EFInput ename="inqu_status-0-year" cname="year" colWidth="3" type="hidden"/>
-            <EF:EFDatePicker cname="月份" blockId="inqu_status" ename="month" row="0" colWidth="3"
-                             format="yyyyMM"  start="year" depth="year" readonly="true"/>
+            <EF:EFInput ename="inqu_status-0-month" cname="月份" colWidth="3" readonly="true"/>
             <EF:EFSelect cname="费用类型" ename="inqu_status-0-costType" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hggp.cw.costType" />
@@ -32,12 +31,12 @@
                 <EF:EFOptions blockId="projName" valueField="projCode" textField="projName"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="isShare" cname="是否分摊到工序" width="80" align="center" required="true"
-                              readonly="true">
+                              >
                 <EF:EFOption label="是" value="0"/>
                 <EF:EFOption label="否" value="1"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="costType" cname="费用类型" width="80" align="center" required="true"
-                              readonly="true">
+                              >
                 <EF:EFCodeOption codeName="hggp.cw.costType"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="costItem" cname="费用项" width="120" align="center" required="true"

src/main/webapp/HG/SC/HGSC003.js

 $(function (){
 
-    var companyCodes = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
+    var companyCodes = __eiInfo.getBlock("roleCompany").getMappedRows();
 
     var projCodes = __eiInfo.getBlock("proj_record_block_id").getMappedRows();
 
@@ -47,9 +47,9 @@ $(function (){
                     field: "companyCode",
                     template: function (dataItem) {
                         for (let i = 0; i < companyCodes.length; i++) {
-                            if (companyCodes[i]['valueField'] === dataItem['companyCode']){
-                                dataItem['companyName'] = companyCodes[i]['textField']
-                                return companyCodes[i]['textField'];
+                            if (companyCodes[i]['companyCode'] === dataItem['companyCode']){
+                                dataItem['companyName'] = companyCodes[i]['companyName']
+                                return companyCodes[i]['companyName'];
                             }
                         }
                         return dataItem["companyCode"];

src/main/webapp/HG/SC/HGSC003.jsp

@@ -29,9 +29,9 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" width="120" required="true"
+                              maxLength="16" readonly="false" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>
             <EF:EFColumn ename="blueprintCode" cname="蓝图编码" enable="false" width="120" align="center"/>

src/main/webapp/HG/SC/HGSC009.js

 $(function () {
-    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("roleCompany").getMappedRows();
     var groupCodeBox = __eiInfo.getBlock("proj_record_block_id").getMappedRows();
 
     $("#QUERY").on("click", function () {
@@ -39,8 +39,8 @@ $(function () {
                 title: "公司名称",
                 template: function (dataItem) {
                     for (let i = 0; i < companyCodeBox.length; i++) {
-                        if (companyCodeBox[i]['valueField'] === dataItem['companyCode']) {
-                            return companyCodeBox[i]['textField'];
+                        if (companyCodeBox[i]['companyCode'] === dataItem['companyCode']) {
+                            return companyCodeBox[i]['companyCode'];
                         }
                     }
                     return dataItem["companyCode"];
@@ -103,8 +103,8 @@ $(function () {
             grid.dataSource.bind("change", function (e) {
                 if (e.field == "companyCode") {
                     for (let i = 0; i < companyCodeBox.length; i++) {
-                        if (companyCodeBox[i]['valueField'] === e.items[0]['companyCode']) {
-                            resultGrid.setCellValue(e.items[0],"companyName",companyCodeBox[i]['textField']);
+                        if (companyCodeBox[i]['companyCode'] === e.items[0]['companyCode']) {
+                            resultGrid.setCellValue(e.items[0],"companyName",companyCodeBox[i]['companyName']);
                         }
                     }
                     loadChange(grid, e, "projCode");

src/main/webapp/HG/SC/HGSC009.jsp

@@ -31,9 +31,9 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" width="120"
+                              maxLength="16" readonly="false" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="companyName" cname="公司名称" width="120" enable="false" readonly="true" align="center" hidden="true" />
 <%--            <EF:EFComboColumn ename="projCode" cname="项目编码"--%>

src/main/webapp/HG/ZL/HGZL001.js

@@ -39,6 +39,24 @@ $(function () {
 					return showUserName(options.createdBy, options.createdName);
 				}
 			}],
+			loadComplete: function (grid) {
+				grid.dataSource.bind("change", function(e) {
+					var item = e.items[0];
+					//数量计算
+					if (e.field == "qualifyQty") {
+						if(item.qualifyQty && item.receiveQty){
+							let unqualifyQty = item.receiveQty - item.qualifyQty;
+							resultGrid.setCellValue(item, 'unqualifyQty', unqualifyQty)
+						}
+					}
+					if (e.field == "unqualifyQty") {
+						if(item.unqualifyQty && item.receiveQty){
+							let qualifyQty = item.receiveQty - item.unqualifyQty;
+							resultGrid.setCellValue(item, 'qualifyQty', qualifyQty)
+						}
+					}
+				});
+			},
 			onDelete: function (e) {
 				// 阻止默认请求，使用自定义删除
 				e.preventDefault();