1.质量巡检单页面完善

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC003.xml

@@ -77,7 +77,7 @@
 	<insert id="insert">
         INSERT INTO ${hpjxSchema}.T_HPKC003 (
             COMPANY_CODE,  <!-- 企业编码 预留 -->
-            DEPT_CODE,  <!-- 部门编码 -->
+            DEP_CODE,  <!-- 部门编码 -->
             DOCUMENT_DATE,  <!-- 单据日期 -->
             PROD_NO,  <!-- 生产入库单号 -->
             WH_CODE,  <!-- 仓库编码 -->
@@ -92,7 +92,7 @@
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME  <!-- 创建时间 -->
         ) VALUES (
-            #companyCode#, #deptCode#, #documentDate#, #prodNo#, #whCode#, #whName#,
+            #companyCode#, #depCode#, #documentDate#, #prodNo#, #whCode#, #whName#,
             #inventType#, #inventCode#, #inventName#, #amount#, #weight#, #remark#,
             #createdBy#, #createdName#, #createdTime#
         )
@@ -106,7 +106,7 @@
         UPDATE ${hpjxSchema}.T_HPKC003
         SET
             COMPANY_CODE = #companyCode#,   <!-- 企业编码 预留 -->
-            DEPT_CODE = #deptCode#,   <!-- 部门编码 -->
+            DEP_CODE = #depCode#,   <!-- 部门编码 -->
             DOCUMENT_DATE = #documentDate#,   <!-- 单据日期 -->
             PROD_NO = #prodNo#,   <!-- 生产入库单号 -->
             WH_CODE = #whCode#,   <!-- 仓库编码 -->
@@ -127,7 +127,7 @@
     <select id="statDate" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC003">
         SELECT
             COMPANY_CODE AS "companyCode",
-            DEPT_CODE AS "deptCode",
+            DEP_CODE AS "depCode",
             WH_CODE AS "whCode",
             INVENT_TYPE AS "inventType",
             INVENT_CODE AS "inventCode",
@@ -138,7 +138,7 @@
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEPT_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE
     </select>
 
 </sqlMap>

src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java

 package com.baosight.hpjx.hp.zl.service;
+
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
@@ -12,13 +13,14 @@ import com.baosight.hpjx.util.StringUtil;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
-import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
-
 import org.apache.commons.collections.MapUtils;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZJH
@@ -62,22 +64,21 @@ public class ServiceHPZL001 extends ServiceBase {
     @Override
     public EiInfo insert(EiInfo inInfo) {
 	    try {
-		    CommonMethod.creatorInfo(inInfo, EiConstant.resultBlock);
 		    List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
 		    for (int i = 0; i < resultRows.size(); i++) {
-			    Map resultRow = resultRows.get(i);
+			    HPZL001 fZl001 = new HPZL001();
+			    fZl001.fromMap(resultRows.get(i));
 			    // 去除日期字符串中的-
-			    String datemonth = MapUtils.getString(resultRow, "receiptDate");
-			    resultRow.put("datemonth", StringUtil.removeHorizontalLine(datemonth));
+			    fZl001.setReceiptDate(StringUtil.removeHorizontalLine(fZl001.getReceiptDate()));
 			    // 项目名称
 			    Map params1 = new HashMap<>();
-			    params1.put("itemCode", MapUtils.getString(resultRow, "itemCode"));
+			    params1.put("itemCode", fZl001.getItemCode());
 			    List<THPSC001> query1 = dao.query("HPSC001.query", params1);
-			    resultRow.put("itemName", query1.get(0).getProjName());
+			    fZl001.setItemName(query1.get(0).getProjName());
 			    // 生成单据号
-			    resultRow.put("chkBillno", SequenceGenerator.getNextSequence(
+			    fZl001.setChkBillno(SequenceGenerator.getNextSequence(
 					    HPConstant.SequenceId.HPZL001_NUMBER));
-			    DaoUtils.insert("HPZL001.insert", resultRow);
+			    DaoUtils.insert("HPZL001.insert", fZl001);
 		    }
 		    inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
 	    } catch (Exception e) {
@@ -86,75 +87,103 @@ public class ServiceHPZL001 extends ServiceBase {
 	    return inInfo;
     }
 	
-
 	/**
-     * 修改操作.
+	 * 修改操作
+	 *
+	 * @param inInfo
+	 * @return
 	 */
 	public EiInfo update(EiInfo inInfo) {
 		try {
-            HPZL001 HPZL001 = new HPZL001();
-            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
-            for (int i = 0; i < eiBlock.getRowCount(); i++) {
-
-                String itemName =inInfo.getCellStr(EiConstant.resultBlock,i,"itemName");
-                String[] str = itemName.split("-");
-                inInfo.setCell(EiConstant.resultBlock,i,"itemCode", str[0]);
-                inInfo.setCell(EiConstant.resultBlock,i,"itemName", str[1]);
-
-                String receiptDate = inInfo.getCellStr(EiConstant.resultBlock,i,"receiptDate");
-                inInfo.setCell(EiConstant.resultBlock,i,"receiptDate", StringUtil.removeHorizontalLine(receiptDate));
-
-                Map<?, ?> map = eiBlock.getRow(i);
-                HPZL001.fromMap(map);
-
-                this.dao.update("HPZL001.update", HPZL001.toMap());
-            }
-            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
-            inInfo.setMsg("修改成功！");
-        } catch (PlatException e) {
-            inInfo.setStatus(EiConstant.STATUS_FAILURE);
-            inInfo.setMsg("操作失败！原因参见详细错误描述！");
-            inInfo.setDetailMsg(e.getMessage());
-            logError("修改失败", e.getMessage());
-            return inInfo;
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HPZL001 fZl001 = new HPZL001();
+				fZl001.fromMap(resultRows.get(i));
+				// 去除日期字符串中的-
+				fZl001.setReceiptDate(StringUtil.removeHorizontalLine(fZl001.getReceiptDate()));
+				// 项目名称
+				Map params1 = new HashMap<>();
+				params1.put("itemCode", fZl001.getItemCode());
+				List<THPSC001> query1 = dao.query("HPSC001.query", params1);
+				fZl001.setItemName(query1.get(0).getProjName());
+				DaoUtils.update("HPZL001.update", fZl001);
 			}
-        return query(inInfo);
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "修改失败");
+		}
+		return inInfo;
 	}
 	
 	/**
-     * 删除操作.
+	 * 删除操作
+	 *
+	 * @param inInfo
+	 * @return
 	 */
-    public EiInfo delete(EiInfo eiInfo) {
-        HPZL001 HPZL001 = new HPZL001();
-        EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
+	public EiInfo delete(EiInfo inInfo) {
 		try {
-            for (int i = 0; i < eiBlock.getRowCount(); i++) {
-                Map<?, ?> map = eiBlock.getRow(i);
-                HPZL001.fromMap(map);
-
-                this.dao.delete("HPZL001.delete", HPZL001.toMap());
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				DaoUtils.update("HPZL001.delete", resultRows.get(i));
 			}
-        } catch (PlatException e) {
-            eiInfo.setStatus(EiConstant.STATUS_FAILURE);
-            eiInfo.setMsg("删除失败，原因参见详细错误描述！");
-            eiInfo.setDetailMsg(e.getMessage());
-            logError("删除失败！", e.getMessage());
-            return eiInfo;
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "删除失败");
+		}
+		return inInfo;
 	}
 	
-        eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
-        eiInfo.setMsg("删除成功！");
-        return eiInfo;
+	/**
+	 * 审核操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo audit(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HPZL001 fZl001 = new HPZL001();
+				fZl001.fromMap(resultRows.get(i));
+				fZl001.setStatus(1);
+				DaoUtils.update("HPZL001.operator", fZl001);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据审核成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "审核失败");
+		}
+		return inInfo;
 	}
 	
 	/**
-	 * 审核操作.
+	 * 反审操作
+	 *
+	 * @param inInfo
+	 * @return
 	 */
-	public EiInfo operator(EiInfo inInfo) {
-		HPZL001 HPZL001 = new HPZL001();
-		EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
-		CommonMethod.updateuserInfo(inInfo, EiConstant.resultBlock);
-		return super.update(inInfo, "HPZL001.operator");
+	public EiInfo unAudit(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HPZL001 fZl001 = new HPZL001();
+				fZl001.fromMap(resultRows.get(i));
+				fZl001.setStatus(0);
+				DaoUtils.update("HPZL001.operator", fZl001);
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据反审成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "审核失败");
+		}
+		return inInfo;
 	}
 	
 	/**

src/main/webapp/HP/KC/HPKC003.jsp

@@ -23,7 +23,7 @@
     </EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息">
-		<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="prodNo" cname="生产入库单号" enable="false" width="130" align="center"/>
 			<EF:EFColumn ename="documentDate" cname="单据日期" width="100" align="center" editType="date"

src/main/webapp/HP/KC/HPKC004.jsp

@@ -23,7 +23,7 @@
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="明细信息">
-	    <EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
+	    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 		    <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 		    <EF:EFColumn ename="saleNo" cname="销售出库单号" enable="false" width="130" align="center"/>
 		    <EF:EFColumn ename="receiptDate" cname="单据日期" width="100" align="center" editType="date"

src/main/webapp/HP/KC/HPKC005.jsp

@@ -28,7 +28,7 @@
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="明细信息">
-	    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+	    <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 		    <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 		    <EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" algin="center"/>
 		    <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
@@ -65,7 +65,7 @@
 		    <EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
 		                 editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
 	    </EF:EFGrid>
+	    <p class="text-info"><span style='color: red;'>注：差异数量=实物数量-账面数量；差异重量=实物重量-账面重量 </span></p>
     </EF:EFRegion>
 
-
 </EF:EFPage>

src/main/webapp/HP/KC/HPKC008.jsp

@@ -19,7 +19,7 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息">
-		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="statNo" cname="统计单单号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="dateMonth" cname="月份" width="100" align="center" editType="date"

src/main/webapp/HP/PZ/HPPZ002.jsp

@@ -23,7 +23,7 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息">
-		<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="custCode" cname="供应商编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/>

src/main/webapp/HP/PZ/HPPZ003.jsp

@@ -23,7 +23,7 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
-		<EF:EFGrid blockId="result" autoDraw="override">
+		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="custCode" cname="客户编码" enable="false" width="100" align="center"/>
 			<EF:EFComboColumn ename="custType" cname="客户类型" width="100" align="center"

src/main/webapp/HP/PZ/HPPZ004.jsp

@@ -23,7 +23,7 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息">
-		<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="inventCode" cname="存货编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="inventName" cname="存货名称" width="120" required="true"/>

src/main/webapp/HP/PZ/HPPZ006.jsp

@@ -25,7 +25,7 @@
     </EF:EFRegion>
 
 	<EF:EFRegion id="result" title="明细信息">
-		<EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
+		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFComboColumn ename="inventType" cname="存货类型" width="120" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
@@ -55,5 +55,4 @@
 		</EF:EFGrid>
 	</EF:EFRegion>
 
-
 </EF:EFPage>

src/main/webapp/HP/PZ/HPPZ007.jsp

@@ -22,7 +22,7 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
-		<EF:EFGrid blockId="result" autoDraw="no">
+		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="whName" cname="仓库名称" width="120" align="center" required="true"/>

src/main/webapp/HP/PZ/HPPZ008.jsp

@@ -20,7 +20,7 @@
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="记录集">
-        <EF:EFGrid blockId="result" autoDraw="no">
+        <EF:EFGrid blockId="result" autoDraw="no" >
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="whType"  required='true' cname="仓库类型"/>
             <EF:EFColumn ename="whCode"  required='true' cname="仓库编码"/>

src/main/webapp/HP/PZ/HPPZ009.jsp

@@ -14,7 +14,7 @@
 	</EF:EFRegion>
 
 	<EF:EFRegion id="result" title="记录集">
-		<EF:EFGrid blockId="result" autoDraw="override">
+		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn cname="企业编码" ename="companyCode" enable="false" width="120" align="center"/>
 			<EF:EFColumn cname="企业名称" ename="companyName" width="140" editType="textarea" required="true"/>

src/main/webapp/HP/ZL/HPZL001.js

 let rowId;
 $(function() {
 
-    // var day1 = new Date();
-    // day1.setTime(day1.getTime());
-    // day1.setDate(day1.getDate()-1);
-    // var month = day1.getMonth() + 1;
-    // var year = day1.getFullYear();
-    // var day = day1.getDate();
-    // let inqu = $("#inqu")
-    //     ,result = $("#result")
-    //     ,from = $("#from")
-    //     ,receiptDate = $("#inqu_status-0-receiptDate");
-    // receiptDate.val(year+"-"+month+"-"+day)
-	//
-    // $("#inqu_status-0-receiptDate").val(year+"-"+month+"-"+day);
-
     // 查询
     $("#QUERY").on("click", function () {
         resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
@@ -48,10 +34,10 @@ $(function() {
 			        let auditStatus = item.status;
 			        if (auditStatus == 0) {
 				        return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
-					        'onclick="audit(' + item.id + ',\'' + chkBillno + '\',1)" >审核</a>';
+					        'onclick="audit(' + item.id + ',\'' + chkBillno + '\')" >审核</a>';
 			        } else {
 				        return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
-					        'onclick="audit(' + item.id + ',\'' + chkBillno + '\',0)" >反审</a>';
+					        'onclick="unAudit(' + item.id + ',\'' + chkBillno + '\')" >反审</a>';
 			        }
 		        }
 	        }]
@@ -100,26 +86,27 @@ function openUploadFile(id) {
  * @param chkBillno
  * @param auditStatus
  */
-function audit(id, chkBillno, auditStatus) {
-	let message = "确认对单号[" + chkBillno + "]进行" + (auditStatus == 1 ? "审核" : "反审") + "操作吗? ";
+function audit(id, chkBillNo) {
+	let message = "确认对单号[" + chkBillNo + "]进行审核操作吗? ";
 	JSUtils.confirm(message, {
 		ok: function () {
-			const inEiInfo = new EiInfo();
-			inEiInfo.set("result-0-id", id);
-			inEiInfo.set("result-0-status", auditStatus);
-			EiCommunicator.send('HPZL001', 'operator', inEiInfo, {
-				onSuccess(response) {
-					NotificationUtil(response.msg);
-					if(response.status >= 0){
-						resultGrid.dataSource.page(1);
-					}
-				},
-				onFail(errorMessage, status, e) {
-					NotificationUtil("执行失败！", "error");
+			JSUtils.submitGridsData("result", "HPZL001", "audit", true);
 		}
-			}, {
-				async: false
 	});
+}
+
+/**
+ * 反审操作
+ *
+ * @param id
+ * @param chkBillno
+ * @param auditStatus
+ */
+function unAudit(id, chkBillNo) {
+	let message = "确认对单号[" + chkBillNo + "]进行反审操作吗? ";
+	JSUtils.confirm(message, {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HPZL001", "unAudit", true);
 		}
 	});
 }

src/main/webapp/HP/ZL/HPZL001.jsp

@@ -27,7 +27,7 @@
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="明细信息">
-        <EF:EFGrid blockId="result" autoDraw="false" isFloat="true" autoFit="true">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 	        <EF:EFColumn ename="id" cname="内码" hidden="true"/>
 	        <EF:EFColumn ename="chkBillno" cname="检查单号" enable="false" width="130" align="center"/>
 	        <EF:EFColumn ename="receiptDate" cname="单据日期" width="120" align="center" editType="date"
@@ -40,9 +40,7 @@
 	        <EF:EFColumn ename="unit" cname="生产组" width="100" readonly="false"/>
 	        <EF:EFColumn ename="notes" cname="质量问题描述" width="100" readonly="false"/>
 	        <EF:EFColumn ename="princ" cname="检查人" width="100" readonly="true"/>
-	        <EF:EFComboColumn ename="status" cname="状态" enable="false" align="center"
-	                          columnTemplate="#=valueField#-#=textField#"
-	                          itemTemplate="#=valueField#-#=textField#" textField="textField"
+	        <EF:EFComboColumn ename="status" cname="状态" enable="false" align="center" textField="textField"
 	                          valueField="valueField" width="100" required="true" optionLabel=" ">
 		        <EF:EFOption label="--请选择--" value=""></EF:EFOption>
 		        <EF:EFOption label="审核" value="1"></EF:EFOption>