1.入库质量异议单

src/main/java/com/baosight/hggp/hg/zl/domain/HGZL001.java

 package com.baosight.hggp.hg.zl.domain;
 
-import com.baosight.iplat4j.core.data.DaoEPBase;
-import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.util.NumberUtils;
-import com.baosight.iplat4j.core.util.StringUtils;
-
 import java.math.BigDecimal;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.data.DaoEPBase;
 import java.util.HashMap;
 import java.util.Map;
+import com.baosight.iplat4j.core.util.StringUtils;
 
 /**
  * Project: <br>
@@ -17,7 +16,7 @@ import java.util.Map;
  * Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
  *
  * @version 1.0
- * @history 2024-05-15 16:04:54 create
+ * @history 2024-05-16 11:17:34 create
  */
 public class HGZL001 extends DaoEPBase {
 
@@ -49,8 +48,8 @@ public class HGZL001 extends DaoEPBase {
 	public static final String FIELD_WIDTH = "width";    		/* 宽度*/
 	public static final String FIELD_THICK = "thick";    		/* 厚度*/
 	public static final String FIELD_RECEIVE_QTY = "receiveQty";    		/* 收货数量*/
-	public static final String FIELD_DELIVER_QTY = "deliverQty";    		/* 退货数量*/
-	public static final String FIELD_DEPOSIT_QTY = "depositQty";    		/* 入库数量*/
+	public static final String FIELD_QUALIFY_QTY = "qualifyQty";    		/* 合格数量*/
+	public static final String FIELD_UNQUALIFY_QTY = "unqualifyQty";    		/* 不合格数量*/
 	public static final String FIELD_RECEIVE_UNIT_WEIGHT = "receiveUnitWeight";    		/* 收货单重*/
 	public static final String FIELD_RECEIVE_WEIGHT = "receiveWeight";    		/* 收货重量*/
 	public static final String FIELD_STATUS = "status";    		/* 状态：0-质检中，1-质检完成*/
@@ -81,8 +80,8 @@ public class HGZL001 extends DaoEPBase {
 	public static final String COL_WIDTH = "WIDTH";    		/* 宽度*/
 	public static final String COL_THICK = "THICK";    		/* 厚度*/
 	public static final String COL_RECEIVE_QTY = "RECEIVE_QTY";    		/* 收货数量*/
-	public static final String COL_DELIVER_QTY = "DELIVER_QTY";    		/* 退货数量*/
-	public static final String COL_DEPOSIT_QTY = "DEPOSIT_QTY";    		/* 入库数量*/
+	public static final String COL_QUALIFY_QTY = "QUALIFY_QTY";    		/* 合格数量*/
+	public static final String COL_UNQUALIFY_QTY = "UNQUALIFY_QTY";    		/* 不合格数量*/
 	public static final String COL_RECEIVE_UNIT_WEIGHT = "RECEIVE_UNIT_WEIGHT";    		/* 收货单重*/
 	public static final String COL_RECEIVE_WEIGHT = "RECEIVE_WEIGHT";    		/* 收货重量*/
 	public static final String COL_STATUS = "STATUS";    		/* 状态：0-质检中，1-质检完成*/
@@ -119,8 +118,8 @@ public class HGZL001 extends DaoEPBase {
 	private BigDecimal width = new BigDecimal(0.000);		/* 宽度*/
 	private BigDecimal thick = new BigDecimal(0.000);		/* 厚度*/
 	private BigDecimal receiveQty = new BigDecimal(0.000);		/* 收货数量*/
-	private BigDecimal deliverQty = new BigDecimal(0.000);		/* 退货数量*/
-	private BigDecimal depositQty = new BigDecimal(0.000);		/* 入库数量*/
+	private BigDecimal qualifyQty = new BigDecimal(0.000);		/* 合格数量*/
+	private BigDecimal unqualifyQty = new BigDecimal(0.000);		/* 不合格数量*/
 	private BigDecimal receiveUnitWeight = new BigDecimal(0.000);		/* 收货单重*/
 	private BigDecimal receiveWeight = new BigDecimal(0.000);		/* 收货重量*/
 	private Integer status;	/* 状态：0-质检中，1-质检完成*/
@@ -248,18 +247,18 @@ public class HGZL001 extends DaoEPBase {
 		eiColumn.setDescName("收货数量");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_DELIVER_QTY);
+		eiColumn = new EiColumn(FIELD_QUALIFY_QTY);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
 		eiColumn.setFieldLength(20);
-		eiColumn.setDescName("退货数量");
+		eiColumn.setDescName("合格数量");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_DEPOSIT_QTY);
+		eiColumn = new EiColumn(FIELD_UNQUALIFY_QTY);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
 		eiColumn.setFieldLength(20);
-		eiColumn.setDescName("入库数量");
+		eiColumn.setDescName("不合格数量");
 		eiMetadata.addMeta(eiColumn);
 
 		eiColumn = new EiColumn(FIELD_RECEIVE_UNIT_WEIGHT);
@@ -707,36 +706,36 @@ public class HGZL001 extends DaoEPBase {
 		this.receiveQty = receiveQty;
 	}
 	/**
-	 * get the deliverQty - 退货数量.
-	 * @return the deliverQty
+	 * get the qualifyQty - 合格数量.
+	 * @return the qualifyQty
 	 */
-	public BigDecimal getDeliverQty() {
-		return this.deliverQty;
+	public BigDecimal getQualifyQty() {
+		return this.qualifyQty;
 	}
 
 	/**
-	 * set the deliverQty - 退货数量.
+	 * set the qualifyQty - 合格数量.
 	 *
-	 * @param deliverQty - 退货数量
+	 * @param qualifyQty - 合格数量
 	 */
-	public void setDeliverQty(BigDecimal deliverQty) {
-		this.deliverQty = deliverQty;
+	public void setQualifyQty(BigDecimal qualifyQty) {
+		this.qualifyQty = qualifyQty;
 	}
 	/**
-	 * get the depositQty - 入库数量.
-	 * @return the depositQty
+	 * get the unqualifyQty - 不合格数量.
+	 * @return the unqualifyQty
 	 */
-	public BigDecimal getDepositQty() {
-		return this.depositQty;
+	public BigDecimal getUnqualifyQty() {
+		return this.unqualifyQty;
 	}
 
 	/**
-	 * set the depositQty - 入库数量.
+	 * set the unqualifyQty - 不合格数量.
 	 *
-	 * @param depositQty - 入库数量
+	 * @param unqualifyQty - 不合格数量
 	 */
-	public void setDepositQty(BigDecimal depositQty) {
-		this.depositQty = depositQty;
+	public void setUnqualifyQty(BigDecimal unqualifyQty) {
+		this.unqualifyQty = unqualifyQty;
 	}
 	/**
 	 * get the receiveUnitWeight - 收货单重.
@@ -820,8 +819,8 @@ public class HGZL001 extends DaoEPBase {
 		setWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WIDTH)), width));
 		setThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_THICK)), thick));
 		setReceiveQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_QTY)), receiveQty));
-		setDeliverQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DELIVER_QTY)), deliverQty));
-		setDepositQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_DEPOSIT_QTY)), depositQty));
+		setQualifyQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_QUALIFY_QTY)), qualifyQty));
+		setUnqualifyQty(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UNQUALIFY_QTY)), unqualifyQty));
 		setReceiveUnitWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_UNIT_WEIGHT)), receiveUnitWeight));
 		setReceiveWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_RECEIVE_WEIGHT)), receiveWeight));
 		setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
@@ -860,8 +859,8 @@ public class HGZL001 extends DaoEPBase {
 		map.put(FIELD_WIDTH, StringUtils.toString(width, eiMetadata.getMeta(FIELD_WIDTH)));
 		map.put(FIELD_THICK, StringUtils.toString(thick, eiMetadata.getMeta(FIELD_THICK)));
 		map.put(FIELD_RECEIVE_QTY, StringUtils.toString(receiveQty, eiMetadata.getMeta(FIELD_RECEIVE_QTY)));
-		map.put(FIELD_DELIVER_QTY, StringUtils.toString(deliverQty, eiMetadata.getMeta(FIELD_DELIVER_QTY)));
-		map.put(FIELD_DEPOSIT_QTY, StringUtils.toString(depositQty, eiMetadata.getMeta(FIELD_DEPOSIT_QTY)));
+		map.put(FIELD_QUALIFY_QTY, StringUtils.toString(qualifyQty, eiMetadata.getMeta(FIELD_QUALIFY_QTY)));
+		map.put(FIELD_UNQUALIFY_QTY, StringUtils.toString(unqualifyQty, eiMetadata.getMeta(FIELD_UNQUALIFY_QTY)));
 		map.put(FIELD_RECEIVE_UNIT_WEIGHT, StringUtils.toString(receiveUnitWeight, eiMetadata.getMeta(FIELD_RECEIVE_UNIT_WEIGHT)));
 		map.put(FIELD_RECEIVE_WEIGHT, StringUtils.toString(receiveWeight, eiMetadata.getMeta(FIELD_RECEIVE_WEIGHT)));
 		map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));

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

@@ -2,21 +2,14 @@ package com.baosight.hggp.hg.zl.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
-import com.baosight.hggp.core.constant.CommonConstant;
-import com.baosight.hggp.core.dao.DaoUtils;
-import com.baosight.hggp.hg.constant.HGConstant;
-import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.zl.domain.HGZL001;
-import com.baosight.hggp.util.AssertUtils;
+import com.baosight.hggp.hg.zl.utils.HGZLUtils;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
-import com.baosight.hggp.util.StringUtil;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
-import com.baosight.iplat4j.ed.util.SequenceGenerator;
-import org.apache.commons.collections.MapUtils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -34,7 +27,8 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "查询",operDesc = "初始化")
+	@Override
+	@OperationLogAnnotation(operModul = "入库质检单", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), null);
@@ -53,14 +47,12 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "查询",operDesc = "查询")
 	@Override
+	@OperationLogAnnotation(operModul = "质量巡检单", operType = "查询", operDesc = "查询")
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
-			String receiptDate = MapUtils.getString(queryMap, "receiptDate");
-			queryMap.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate,
-					StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
+			HGZLUtils.HgZl001.setCondition(queryMap);
 			inInfo = super.query(inInfo, HGZL001.QUERY, new HGZL001());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -75,7 +67,6 @@ public class ServiceHGZL001 extends ServiceBase {
 	 * @return
 	 */
 	@OperationLogAnnotation(operModul = "质量巡检单",operType = "新增",operDesc = "新增")
-	@Override
 	public EiInfo insert(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/java/com/baosight/hggp/hg/zl/utils/HGZLUtils.java

+package com.baosight.hggp.hg.zl.utils;
+
+import com.baosight.hggp.hg.utils.HGUtils;
+import com.baosight.hggp.hg.zl.domain.HGZL001;
+import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.MapUtils;
+import com.baosight.hggp.util.StringUtils;
+
+import java.util.Map;
+
+/**
+ * @author:songx
+ * @date:2024/5/16,11:26
+ */
+public class HGZLUtils {
+	
+	/**
+	 * HGZL001 工具类
+	 *
+	 * @author:songx
+	 * @date:2024/5/9,16:58
+	 */
+	public static class HgZl001 {
+		
+		/**
+		 * 设置查询条件
+		 *
+		 * @param queryRow 集合
+		 * @return
+		 */
+		public static void setCondition(Map queryRow) {
+			HGUtils.setCondition(queryRow);
+			// 单据日期
+			String receiptDate = MapUtils.getString(queryRow, HGZL001.FIELD_RECEIPT_DATE);
+			if (StringUtils.isNotBlank(receiptDate)) {
+				queryRow.put(HGZL001.FIELD_RECEIPT_DATE, DateUtils.formatShort(receiptDate));
+			}
+		}
+	}
+}

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

+$(function () {
+
+	IPLATUI.EFGrid = {
+		"result": {
+			pageable: {
+				input: true,
+				numeric: false,
+				pageSize: 20,
+				pageSizes: [10, 20, 30, 50, 100, 200]
+			},
+			columns: [{
+				field: "receiptDate",
+				attributes: {
+					class: "i-input-readonly"
+				}
+			}, {
+				field: "operator",
+				template: function (item) {
+					let status = item.status;
+					if (status === "0") {
+						return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
+							'onclick="doProcess(' + item.id + ', \'' + item.checkNo + '\')" >处理</a>';
+					} else {
+						return "";
+					}
+				}
+			}, {
+				field: "problemPhoto",
+				template: function (item) {
+					if (!isBlank(item.checkNo)) {
+						return '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+							+ 'onclick="showUploadFile(' + item.id + ', 1)"  >附件清单</a>';
+					} else {
+						return "";
+					}
+				}
+			}, {
+				field: "processPhoto",
+				template: function (item) {
+					if (!isBlank(item.checkNo)) {
+						return '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+							+ 'onclick="showUploadFile(' + item.id + ', 2)"  >附件清单</a>';
+					} else {
+						return "";
+					}
+				}
+			}, {
+				field: "createdName",
+				template: function (options) {
+					return showUserName(options.createdBy, options.createdName);
+				}
+			}],
+			onDelete: function (e) {
+				// 阻止默认请求，使用自定义删除
+				e.preventDefault();
+				deleteFunc();
+			},
+			onSuccess: function (e) {
+			}
+		}
+	}
+
+	// 查询
+	$("#QUERY").on("click", query);
+
+	// 选择生产任务
+	$("#SELECT_PROD").on("click", selectProd);
+});
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+	// 查询
+	query();
+});
+
+/**
+ * 查询
+ */
+let query = function () {
+	resultGrid.dataSource.page(1);
+}
+
+/**
+ * 显示附件清单
+ *
+ * @param id
+ * @param docType
+ */
+let showUploadFile = function (id, docType) {
+	JSColorbox.open({
+		href: "HPZL001A?methodName=initLoad&inqu_status-0-checkId=" + id + "&inqu_status-0-docType=" + docType,
+		title: "<div style='text-align: center;'>附件清单</div>",
+		width: "80%",
+		height: "80%",
+	});
+}
+
+/**
+ * 提交操作
+ *
+ * @param id
+ * @param checkNo
+ */
+let doProcess = function (id, checkNo) {
+	let message = "确认将单号[" + checkNo + "]的状态修改为已处理吗? ";
+	JSUtils.confirm(message, {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HPZL001", "doProcess", true);
+		}
+	});
+}
+
+/**
+ * 挑选生产任务
+ */
+let selectProd = function () {
+	JSColorbox.open({
+		href: "HPZL001B?methodName=initLoad",
+		title: "<div style='text-align: center;'>生产任务查询</div>",
+		width: "90%",
+		height: "80%",
+		callbackName: selectStockCallback
+	});
+}
+
+/**
+ * 挑选生产任务回调
+ */
+let selectStockCallback = function () {
+	// 刷新页面
+	query();
+	// 关闭弹窗
+	JSColorbox.close();
+}
+
+/**
+ * 删除
+ */
+function deleteFunc() {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据");
+		return;
+	}
+	let flag = true;
+	$.each(rows, function(index, item) {
+		let status= item.get("status");
+		if(status==="1"){
+			message("选中的第"+(index+1)+"行记录已处理，不能删除!");
+			flag = false;
+			return false;
+		}
+	});
+	if(flag){
+		JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作? ", {
+			ok: function () {
+				JSUtils.submitGridsData("result", "HPZL001", "delete", true);
+			}
+		});
+	}
+}

src/main/webapp/HG/ZL/HPZL001.jsp → src/main/webapp/HG/ZL/HGZL001.jsp

@@ -41,17 +41,24 @@
 			             required="true"/>
 			<EF:EFColumn ename="processPhoto" cname="处理照片" locked="true" enable="false" width="100" align="center"
 			             required="true"/>
+			<EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" width="120" align="center" editType="date"
+			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
 			<EF:EFColumn ename="checkNo" cname="检查单号" enable="false" width="130" align="center"/>
 			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="100" align="center">
 				<EF:EFOption label="已处理" value="1"></EF:EFOption>
 				<EF:EFOption label="未处理" value="0"></EF:EFOption>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" width="120" align="center" editType="date"
-			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
-			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="inventName" cname="部件名称" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="subInventName" cname="零件名称" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="130" align="center"/>
+			<EF:EFColumn ename="companyCode" cname="公司编码" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="130" align="center"/>
+			<EF:EFColumn ename="receiveNo" cname="收货单号" enable="false" width="120" align="center"/>
+			<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="specId" cname="规格ID" enable="false" width="100" align="center" hidden="true"/>
+			<EF:EFColumn ename="spec" cname="规格" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="receiveQty" cname="收货数量" enable="false" width="120" align="right" format="{0:N0}"/>
+			<EF:EFColumn ename="receiveWeight" cname="收货重量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="qualifyQty" cname="合格数量" width="120" align="right" format="{0:N0}" required="true"/>
+			<EF:EFColumn ename="unqualifyQty" cname="不合格数量" width="120" align="right" format="{0:N0}" required="true"/>
 			<EF:EFComboColumn ename="poorType" cname="不良品类" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpjx.poorType"/>
 			</EF:EFComboColumn>
@@ -60,12 +67,11 @@
 			                  blockName="user_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center"/>
-			<EF:EFColumn ename="prodTaskNo" cname="生产任务号" enable="false" width="150" align="center"/>
-			<EF:EFColumn ename="projCode" cname="项目编码" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="inventCode" cname="部件编码" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="subInventCode" cname="零件编码" enable="false" width="130" align="center"/>
-			<EF:EFColumn ename="orgNo" cname="生产组编码" enable="false" width="130" align="center"/>
+			<EF:EFColumn ename="material" cname="材质" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="length" cname="长(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="width" cname="宽(M)" enable="false" width="80" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="thick" cname="厚(M)" enable="false" width="80" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="150" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="150" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']" dateFormat="yyyy-MM-dd HH:mm:ss"/>

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

-let projNameGlobalData = [];
-let inventNameGlobalData = [];
-let subInventNameGlobalData = [];
-let orgNameGlobalData = [];
-$(function () {
-
-	IPLATUI.EFGrid = {
-		"result": {
-			pageable: {
-				input: true,
-				numeric: false,
-				pageSize: 20,
-				pageSizes: [10, 20, 30, 50, 100, 200]
-			},
-			columns: [{
-				field: "receiptDate",
-				attributes: {
-					class: "i-input-readonly"
-				}
-			}, {
-				field: "operator",
-				template: function (item) {
-					let status = item.status;
-					if (status === "0") {
-						return '<a style="cursor: pointer;display: flex;justify-content: center;" ' +
-							'onclick="doProcess(' + item.id + ', \'' + item.checkNo + '\')" >处理</a>';
-					} else {
-						return "";
-					}
-				}
-			}, {
-				field: "problemPhoto",
-				template: function (item) {
-					if (!isBlank(item.checkNo)) {
-						return '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-							+ 'onclick="showUploadFile(' + item.id + ', 1)"  >附件清单</a>';
-					} else {
-						return "";
-					}
-				}
-			}, {
-				field: "processPhoto",
-				template: function (item) {
-					if (!isBlank(item.checkNo)) {
-						return '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-							+ 'onclick="showUploadFile(' + item.id + ', 2)"  >附件清单</a>';
-					} else {
-						return "";
-					}
-				}
-			},
-				// {
-			// 	field: "projCode",
-			// 	template: function (dataItem) {
-			// 		for (let i = 0; i < projNameGlobalData.length; i++) {
-			// 			if (projNameGlobalData[i]['valueField'] === dataItem['projCode']) {
-			// 				return projNameGlobalData[i]['textField'];
-			// 			}
-			// 		}
-			// 		return "";
-			// 	},
-			// 	editor: function (container, options) {
-			// 		let inInfo = new EiInfo();
-			// 		// 1.部分分派，2.全部分派
-			// 		inInfo.set("inqu_status-0-statuses", [1, 2]);
-			// 		inInfo.set("serviceName", "HPSC005");
-			// 		inInfo.set("methodName", "queryProjComboBox");
-			// 		inInfo.set("blockId", "proj_prod_block_id");
-			// 		inInfo.set("field", options.field);
-			// 		refreshSelect(container, inInfo);
-			// 	}
-			// }, {
-			// 	field: "inventCode",
-			// 	template: function (dataItem) {
-			// 		for (let i = 0; i < inventNameGlobalData.length; i++) {
-			// 			if (inventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
-			// 				return inventNameGlobalData[i]['textField'];
-			// 			}
-			// 		}
-			// 		return "";
-			// 	},
-			// 	editor: function (container, options) {
-			// 		let projCode = options.model["projCode"];
-			// 		let inInfo = new EiInfo();
-			// 		inInfo.set("inqu_status-0-projCode", isBlank(projCode) ? " " : projCode);
-			// 		inInfo.set("serviceName", "HPSC003");
-			// 		inInfo.set("methodName", "queryInventComboBox");
-			// 		inInfo.set("blockId", "invent_record_block_id");
-			// 		inInfo.set("field", options.field);
-			// 		refreshSelect(container, inInfo);
-			// 	}
-			// }, {
-			// 	field: "subInventCode",
-			// 	template: function (dataItem) {
-			// 		for (let i = 0; i < subInventNameGlobalData.length; i++) {
-			// 			if (subInventNameGlobalData[i]['valueField'] === dataItem['subInventCode']) {
-			// 				return subInventNameGlobalData[i]['textField'];
-			// 			}
-			// 		}
-			// 		return "";
-			// 	},
-			// 	editor: function (container, options) {
-			// 		let inventCode = options.model["inventCode"];
-			// 		let inInfo = new EiInfo();
-			// 		inInfo.set("inqu_status-0-parentPrdtCode", isBlank(inventCode) ? " " : inventCode);
-			// 		inInfo.set("serviceName", "HPSC004");
-			// 		inInfo.set("methodName", "queryInventComboBox");
-			// 		inInfo.set("blockId", "sub_invent_record_block_id");
-			// 		inInfo.set("field", options.field);
-			// 		refreshSelect(container, inInfo);
-			// 	}
-			// }, {
-			// 	field: "orgNo",
-			// 	template: function (dataItem) {
-			// 		for (let i = 0; i < orgNameGlobalData.length; i++) {
-			// 			if (orgNameGlobalData[i]['valueField'] === dataItem['orgNo']) {
-			// 				return orgNameGlobalData[i]['textField'];
-			// 			}
-			// 		}
-			// 		return "";
-			// 	},
-			// 	editor: function (container, options) {
-			// 		let subInventCode = options.model["subInventCode"];
-			// 		let inInfo = new EiInfo();
-			// 		inInfo.set("inqu_status-0-prdtCode", isBlank(subInventCode) ? " " : subInventCode);
-			// 		inInfo.set("serviceName", "HPSC005");
-			// 		inInfo.set("methodName", "queryOrgComboBox");
-			// 		inInfo.set("blockId", "org_prod_block_id");
-			// 		inInfo.set("field", options.field);
-			// 		refreshSelect(container, inInfo);
-			// 	}
-			// },
-				{
-				field: "createdName",
-				template: function (options) {
-					return showUserName(options.createdBy, options.createdName);
-				}
-			}],
-			onDelete: function (e) {
-				// 阻止默认请求，使用自定义删除
-				e.preventDefault();
-				deleteFunc();
-			},
-			onSuccess: function (e) {
-				if(e.eiInfo.extAttr.methodName == 'delete' ){
-					query();
-				}
-			}
-		}
-	}
-
-	// 查询
-	$("#QUERY").on("click", query);
-
-	// 选择生产任务
-	$("#SELECT_PROD").on("click", selectProd);
-});
-
-/**
- * 页面加载时执行
- */
-$(window).load(function () {
-	// 项目名称
-	// let inInfo = new EiInfo();
-	// EiCommunicator.send("HPSC001", "queryComboBox", inInfo, {
-	// 	onSuccess: function (ei) {
-	// 		projNameGlobalData = ei.getBlock("proj_record_block_id").getMappedRows();
-	// 	},
-	// 	onFail: function (ei) {
-	// 	}
-	// }, {async: false});
-	// // 部件名称
-	// EiCommunicator.send("HPSC003", "queryInventComboBox", inInfo, {
-	// 	onSuccess: function (ei) {
-	// 		inventNameGlobalData = ei.getBlock("invent_record_block_id").getMappedRows();
-	// 	},
-	// 	onFail: function (ei) {
-	// 	}
-	// }, {async: false});
-	// // 零件名称
-	// EiCommunicator.send("HPSC004", "queryInventComboBox", inInfo, {
-	// 	onSuccess: function (ei) {
-	// 		subInventNameGlobalData = ei.getBlock("sub_invent_record_block_id").getMappedRows();
-	// 	},
-	// 	onFail: function (ei) {
-	// 	}
-	// }, {async: false});
-	// // 生产组名称
-	// EiCommunicator.send("HPSC005", "queryOrgComboBox", inInfo, {
-	// 	onSuccess: function (ei) {
-	// 		orgNameGlobalData = ei.getBlock("org_prod_block_id").getMappedRows();
-	// 	},
-	// 	onFail: function (ei) {
-	// 	}
-	// }, {async: false});
-	// 查询
-	query();
-});
-
-/**
- * 查询
- */
-let query = function () {
-	resultGrid.dataSource.page(1);
-}
-
-/**
- * 显示附件清单
- *
- * @param id
- * @param docType
- */
-let showUploadFile = function (id, docType) {
-	JSColorbox.open({
-		href: "HPZL001A?methodName=initLoad&inqu_status-0-checkId=" + id + "&inqu_status-0-docType=" + docType,
-		title: "<div style='text-align: center;'>附件清单</div>",
-		width: "80%",
-		height: "80%",
-	});
-}
-
-/**
- * 提交操作
- *
- * @param id
- * @param checkNo
- */
-let doProcess = function (id, checkNo) {
-	let message = "确认将单号[" + checkNo + "]的状态修改为已处理吗? ";
-	JSUtils.confirm(message, {
-		ok: function () {
-			JSUtils.submitGridsData("result", "HPZL001", "doProcess", true);
-		}
-	});
-}
-
-/**
- * 挑选生产任务
- */
-let selectProd = function () {
-	JSColorbox.open({
-		href: "HPZL001B?methodName=initLoad",
-		title: "<div style='text-align: center;'>生产任务查询</div>",
-		width: "90%",
-		height: "80%",
-		callbackName: selectStockCallback
-	});
-}
-
-/**
- * 挑选生产任务回调
- */
-let selectStockCallback = function () {
-	// 刷新页面
-	query();
-	// 关闭弹窗
-	JSColorbox.close();
-}
-
-/**
- * 删除
- */
-function deleteFunc() {
-	let rows = resultGrid.getCheckedRows();
-	if (rows.length < 1) {
-		message("请选择数据");
-		return;
-	}
-	let flag = true;
-	$.each(rows, function(index, item) {
-		let status= item.get("status");
-		if(status==="1"){
-			message("选中的第"+(index+1)+"行记录已处理，不能删除!");
-			flag = false;
-			return false;
-		}
-	});
-	if(flag){
-		JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作? ", {
-			ok: function () {
-				JSUtils.submitGridsData("result", "HPZL001", "delete", true);
-			}
-		});
-	}
-}