1.库存盘点覆盖保存方式

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java

@@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.kc.service;
 
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.InventTypeEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPConstant;
@@ -10,6 +11,7 @@ import com.baosight.hpjx.hp.kc.domain.HPKC005;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
 import com.baosight.hpjx.hp.kc.tools.HPKCTools;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
+import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.BeanUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
@@ -25,6 +27,7 @@ import org.apache.commons.collections.MapUtils;
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +39,10 @@ import java.util.Map;
  */
 public class ServiceHPKC005 extends ServiceBase {
 	
+	// 指定存货类型
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
+			InventTypeEnum.CONSUMABLE.getCode(), InventTypeEnum.WASTE.getCode()};
+	
 	/**
 	 * 画面初始化
 	 *
@@ -46,10 +53,12 @@ public class ServiceHPKC005 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "库存盘点单", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null, false);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
+			Map queryMap = new HashMap();
+			queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), queryMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC006().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -81,38 +90,80 @@ public class ServiceHPKC005 extends ServiceBase {
 	}
 	
 	/**
-	 * 新增操作
+	 * 保存操作.
 	 *
 	 * @param inInfo
 	 * @return
 	 */
-	@Override
-	@OperationLogAnnotation(operModul = "库存盘点单", operType = "新增", operDesc = "新增")
-	public EiInfo insert(EiInfo inInfo) {
+	@OperationLogAnnotation(operModul = "其他入库单", operType = "插入", operDesc = "保存")
+	public EiInfo save(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
-			for (int i = 0; i < resultRows.size(); i++) {
-				HPKC005 fKc005 = new HPKC005();
-				fKc005.fromMap(resultRows.get(i));
-				// 设置基础信息
-				this.setBaseInfo(fKc005);
-				// 生成单据号
-				fKc005.setCheckNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.CHECK_NO));
-				DaoUtils.insert(HPKC005.INSERT, fKc005);
-				// 修改库存
-				HPKCTools.updateStock(fKc005.getWhCode(), fKc005.getInventRecordId(),
-						fKc005.getDiffAmount(), fKc005.getDiffWeight());
-			}
+			// 数据校验
+			this.checkSaveData(resultRows);
+			// 写入数据
+			this.saveData(resultRows);
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
 		} catch (Exception e) {
-			LogUtils.setDetailMsg(inInfo, e, "新增失败");
+			LogUtils.setDetailMsg(inInfo, e, "保存失败");
 		}
 		return inInfo;
 	}
 	
 	/**
+	 * 保存数据
+	 *
+	 * @param resultRows
+	 */
+	private void saveData(List<Map> resultRows) {
+		for (Map resultRow : resultRows) {
+			HPKC005 fKc005 = new HPKC005();
+			fKc005.fromMap(resultRow);
+			if (fKc005.getId() == null || fKc005.getId() == 0) {
+				this.addData(fKc005);
+			} else {
+				// TODO 盘点不支持修改
+			}
+		}
+	}
+	
+	/**
+	 * 新增数据
+	 *
+	 * @param fKc005
+	 */
+	private void addData(HPKC005 fKc005) {
+		// 设置基础信息
+		this.setBaseInfo(fKc005);
+		// 生成单据号
+		fKc005.setCheckNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.CHECK_NO));
+		DaoUtils.insert(HPKC005.INSERT, fKc005);
+		// 修改库存
+		HPKCTools.updateStock(fKc005.getWhCode(), fKc005.getInventRecordId(),
+				fKc005.getDiffAmount(), fKc005.getDiffWeight());
+	}
+	
+	/**
+	 * 校验保存的数据
+	 *
+	 * @param resultRows
+	 */
+	private void checkSaveData(List<Map> resultRows) {
+		for (int i = 0; i < resultRows.size(); i++) {
+			HPKC005 fKc005 = new HPKC005();
+			fKc005.fromMap(resultRows.get(i));
+			AssertUtils.isEmpty(fKc005.getInventCode(), "存货类型不能为空");
+			AssertUtils.isEmpty(fKc005.getWhCode(), "仓库名称不能为空");
+			AssertUtils.isEmpty(fKc005.getInventCode(), "存货名称不能为空");
+			AssertUtils.isNull(fKc005.getInventRecordId(), "规格不能为空");
+			AssertUtils.isGt(BigDecimal.ZERO, fKc005.getBookAmount(), "账面数量必须大于0");
+			AssertUtils.isGt(BigDecimal.ZERO, fKc005.getEntityAmount(), "实物重量必须大于0");
+		}
+	}
+	
+	/**
 	 * 设置基础信息
 	 *
 	 * @param fKc005

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

 let whNameGlobalData = [];
 let inventNameGlobalData = [];
 let specGlobalData = [];
+
 $(function() {
 
     IPLATUI.EFGrid = {
 		pageable: {
 			pageSize: 20,
-			pageSizes: [10, 20, 50, 70, 100],
+			pageSizes: [20, 50, 70, 100],
 		},
         "result": {
 	        columns: [{
 		        field: "receiptDate",
+		        attributes: {
+			        class: "i-input-readonly"
+		        },
 		        defaultValue: function () {
 			        return currShortDate();
 		        }
@@ -81,6 +85,11 @@ $(function() {
 	        }],
             loadComplete: function (grid) {
             },
+	        onSave: function (e) {
+		        // 阻止后台保存请求，使用自定义保存
+		        e.preventDefault();
+		        save();
+	        },
 			onSuccess: function (e) {
 				if(e.eiInfo.extAttr.methodName == 'update'
 					||e.eiInfo.extAttr.methodName == 'insert'
@@ -102,9 +111,25 @@ $(function() {
  * 页面加载时执行
  */
 $(window).load(function () {
+	// 仓库名称
+	initWh()
+	// 存货名称
+	initInvent()
+	// 规格
+	initSpec()
+	// 查询
+	query();
+});
+
+
+/**
+ * 初始化仓库
+ */
+let initWh = function () {
 	let inInfo = new EiInfo();
+	// 1.原料，2.耗材，5.废料
+	inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
 	inInfo.set("inqu_status-0-isSplicingSymbol", false);
-	// 仓库名称
 	EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
 		onSuccess: function (ei) {
 			whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
@@ -112,7 +137,16 @@ $(window).load(function () {
 		onFail: function (ei) {
 		}
 	}, {async: false});
-	// 存货名称
+}
+
+/**
+ * 初始化存货
+ */
+let initInvent = function () {
+	let inInfo = new EiInfo();
+	// 1.原料，2.耗材，5.废料
+	inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+	inInfo.set("inqu_status-0-isSplicingSymbol", false);
 	EiCommunicator.send("HPPZ004", "queryComboBox", inInfo, {
 		onSuccess: function (ei) {
 			inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
@@ -120,17 +154,24 @@ $(window).load(function () {
 		onFail: function (ei) {
 		}
 	}, {async: false});
-	// 规格
-	EiCommunicator.send("HPPZ006", "queryComboBoxSpec", inInfo, {
+}
+
+/**
+ * 初始化规格
+ */
+let initSpec = function () {
+	let inInfo = new EiInfo();
+	// 1.原料，2.耗材，5.废料
+	inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+	inInfo.set("inqu_status-0-isSplicingSymbol", false);
+	EiCommunicator.send("HPPZ006", "queryComboBoxAll", inInfo, {
 		onSuccess: function (ei) {
-			specGlobalData = ei.getBlock("invent_spec_block_id").getMappedRows();
+			specGlobalData = ei.getBlock("invent_all_block_id").getMappedRows();
 		},
 		onFail: function (ei) {
 		}
 	}, {async: false});
-	// 查询
-	query();
-});
+}
 
 /**
  * 查询
@@ -171,6 +212,32 @@ let save = function () {
 		message("请选择数据");
 		return;
 	}
+	for (let i = 0; i < rows.length; i++) {
+		if (isBlank(rows[i]['inventType'])) {
+			message("勾选的第" + (i + 1) + "行存货类型不能为空");
+			return;
+		}
+		if (isBlank(rows[i]['whCode'])) {
+			message("勾选的第" + (i + 1) + "行仓库名称不能为空");
+			return;
+		}
+		if (isBlank(rows[i]['inventCode'])) {
+			message("勾选的第" + (i + 1) + "行存货名称不能为空");
+			return;
+		}
+		if (isBlank(rows[i]['inventRecordId'])) {
+			message("勾选的第" + (i + 1) + "行规格不能为空");
+			return;
+		}
+		if (!isPositiveInteger(rows[i]['bookAmount'])) {
+			message("勾选的第" + (i + 1) + "行账面数量必须是大于0的整数");
+			return;
+		}
+		if (!isPositiveInteger(rows[i]['entityAmount'])) {
+			message("勾选的第" + (i + 1) + "行实物数量必须是大于0的整数");
+			return;
+		}
+	}
 	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
 		ok: function () {
 			JSUtils.submitGridsData("result", "HPKC005", "save", true);

src/main/webapp/HP/KC/HPKC006.js

@@ -155,7 +155,6 @@ $(window).load(function () {
 	query();
 });
 
-
 /**
  * 初始化仓库
  */