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

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC001.java

@@ -33,8 +33,8 @@ public class HPKC001 extends DaoEPBase {
 	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 更新人*/
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 更新人名称*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
-	public static final String FIELD_PURCHASE_CODE = "purchaseCode";    		/* 采购单号*/
-	public static final String FIELD_OLD_PURCHASE_CODE = "oldPurchaseCode";    		/* 原采购单号*/
+	public static final String FIELD_PURCHASE_NO = "purchaseNo";    		/* 采购单号*/
+	public static final String FIELD_OLD_PURCHASE_NO = "oldPurchaseNo";    		/* 原采购单号*/
 	public static final String FIELD_RECEIPT_DATE = "receiptDate";    		/* 单据日期*/
 	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
 	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
@@ -56,7 +56,7 @@ public class HPKC001 extends DaoEPBase {
 	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 更新人*/
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 更新人名称*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
-	public static final String COL_OLD_PURCHASE_CODE = "OLD_PURCHASE_CODE";    		/* 原采购单号*/
+	public static final String COL_OLD_PURCHASE_NO = "OLD_PURCHASE_NO";    		/* 原采购单号*/
 	public static final String COL_RECEIPT_DATE = "RECEIPT_DATE";    		/* 单据日期*/
 	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
 	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
@@ -69,11 +69,11 @@ public class HPKC001 extends DaoEPBase {
 	public static final String COL_REMARKS = "REMARKS";    		/* 备注*/
 	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 是否删除0.否1.是*/
 
-	public static final String QUERY = "t_hpkc001.query";
-	public static final String COUNT = "t_hpkc001.count";
-	public static final String INSERT = "t_hpkc001.insert";
-	public static final String UPDATE = "t_hpkc001.update";
-	public static final String DELETE = "t_hpkc001.delete";
+	public static final String QUERY = "HPKC001.query";
+	public static final String COUNT = "HPKC001.count";
+	public static final String INSERT = "HPKC001.insert";
+	public static final String UPDATE = "HPKC001.update";
+	public static final String DELETE = "HPKC001.delete";
 
 	private Long id = null;	/* 主键id*/
 	private String companyCode = " ";		/* 企业编码 预留*/
@@ -84,8 +84,8 @@ public class HPKC001 extends DaoEPBase {
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedName = " ";		/* 更新人名称*/
 	private String updatedTime ;		/* 更新时间*/
-	private String purchaseCode = " ";		/* 采购单号*/
-	private String oldPurchaseCode = " ";		/* 原采购单号*/
+	private String purchaseNo = " ";		/* 采购单号*/
+	private String oldPurchaseNo = " ";		/* 原采购单号*/
 	private String receiptDate ;		/* 单据日期*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
@@ -141,11 +141,11 @@ public class HPKC001 extends DaoEPBase {
 		eiColumn.setDescName("更新时间");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_PURCHASE_CODE);
+		eiColumn = new EiColumn(FIELD_PURCHASE_NO);
 		eiColumn.setDescName("采购单号");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_OLD_PURCHASE_CODE);
+		eiColumn = new EiColumn(FIELD_OLD_PURCHASE_NO);
 		eiColumn.setDescName("原采购单号");
 		eiMetadata.addMeta(eiColumn);
 
@@ -354,36 +354,36 @@ public class HPKC001 extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 	/**
-	 * get the purchaseCode - 采购单号.
-	 * @return the purchaseCode
+	 * get the purchaseNo - 采购单号.
+	 * @return the purchaseNo
 	 */
-	public String getPurchaseCode() {
-		return this.purchaseCode;
+	public String getPurchaseNo() {
+		return this.purchaseNo;
 	}
 
 	/**
-	 * set the purchaseCode - 采购单号.
+	 * set the purchaseNo - 采购单号.
 	 *
-	 * @param purchaseCode - 采购单号
+	 * @param purchaseNo - 采购单号
 	 */
-	public void setPurchaseCode(String purchaseCode) {
-		this.purchaseCode = purchaseCode;
+	public void setPurchaseNo(String purchaseNo) {
+		this.purchaseNo = purchaseNo;
 	}
 
 	/**
-	 * set the oldPurchaseCode - 原采购单号.
+	 * set the oldPurchaseNo - 原采购单号.
 	 *
-	 * @param oldPurchaseCode - 原采购单号
+	 * @param oldPurchaseNo - 原采购单号
 	 */
-	public void setOldPurchaseCode(String oldPurchaseCode) {
-		this.oldPurchaseCode = oldPurchaseCode;
+	public void setOldPurchaseNo(String oldPurchaseNo) {
+		this.oldPurchaseNo = oldPurchaseNo;
 	}
 	/**
-	 * get the oldPurchaseCode - 原采购单号.
-	 * @return the oldPurchaseCode
+	 * get the oldPurchaseNo - 原采购单号.
+	 * @return the oldPurchaseNo
 	 */
-	public String getOldPurchaseCode() {
-		return this.oldPurchaseCode;
+	public String getOldPurchaseNo() {
+		return this.oldPurchaseNo;
 	}
 
 	/**
@@ -579,8 +579,8 @@ public class HPKC001 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
-		setPurchaseCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PURCHASE_CODE)), purchaseCode));
-		setOldPurchaseCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_PURCHASE_CODE)), oldPurchaseCode));
+		setPurchaseNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PURCHASE_NO)), purchaseNo));
+		setOldPurchaseNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OLD_PURCHASE_NO)), oldPurchaseNo));
 		setReceiptDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIPT_DATE)), receiptDate));
 		setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
 		setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
@@ -610,8 +610,8 @@ public class HPKC001 extends DaoEPBase {
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
-		map.put(FIELD_PURCHASE_CODE, StringUtils.toString(purchaseCode, eiMetadata.getMeta(FIELD_PURCHASE_CODE)));
-		map.put(FIELD_OLD_PURCHASE_CODE, StringUtils.toString(oldPurchaseCode, eiMetadata.getMeta(FIELD_OLD_PURCHASE_CODE)));
+		map.put(FIELD_PURCHASE_NO, StringUtils.toString(purchaseNo, eiMetadata.getMeta(FIELD_PURCHASE_NO)));
+		map.put(FIELD_OLD_PURCHASE_NO, StringUtils.toString(oldPurchaseNo, eiMetadata.getMeta(FIELD_OLD_PURCHASE_NO)));
 		map.put(FIELD_RECEIPT_DATE, StringUtils.toString(receiptDate, eiMetadata.getMeta(FIELD_RECEIPT_DATE)));
 		map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
 		map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));

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

@@ -42,6 +42,7 @@ public class ServiceHPKC001 extends ServiceBase {
             queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), queryMap);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_ALL_BLOCK_ID), queryMap, false);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC001().eiMetadata);
         } catch (PlatException e) {
@@ -92,7 +93,7 @@ public class ServiceHPKC001 extends ServiceBase {
                 // 设置基础信息
                 this.setBaseInfo(fKc001);
                 // 生成入库单号
-                fKc001.setPurchaseCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC001_NUMBER));
+                fKc001.setPurchaseNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC001_NUMBER));
                 DaoUtils.insert(HPKC001.INSERT, fKc001);
                 // 修改库存
                 HPKCTools.updateStock(fKc001.getWhCode(), fKc001.getInventRecordId(), fKc001.getAmount(),
@@ -131,7 +132,7 @@ public class ServiceHPKC001 extends ServiceBase {
                 this.setBaseInfo(fKc001);
                 DaoUtils.update(HPKC001.UPDATE, fKc001);
                 // 计算差异数量与重量
-                HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseCode());
+                HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseNo());
                 BigDecimal diffAmount = fKc001.getAmount().subtract(dbKc001.getAmount());
                 BigDecimal diffWeight = fKc001.getWeight().subtract(dbKc001.getWeight());
                 // 修改库存
@@ -197,12 +198,12 @@ public class ServiceHPKC001 extends ServiceBase {
                 fKc001.fromMap(resultRows.get(i));
                 DaoUtils.update(HPKC001.DELETE, fKc001);
                 // 生成红冲记录
-                HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseCode());
+                HPKC001 dbKc001 = mapKc001.get(fKc001.getPurchaseNo());
                 HPKC001 newKc006 = BeanUtils.copy(dbKc001, HPKC001.class);
-                newKc006.setPurchaseCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.OTHER_ENTER_NO));
+                newKc006.setPurchaseNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.OTHER_ENTER_NO));
                 newKc006.setAmount(newKc006.getAmount().negate());
                 newKc006.setWeight(newKc006.getWeight().negate());
-                newKc006.setOldPurchaseCode(newKc006.getPurchaseCode());
+                newKc006.setOldPurchaseNo(newKc006.getPurchaseNo());
                 newKc006.setDeleteFlag(CommonConstant.YesNo.YES_1);
                 DaoUtils.insert(HPKC001.INSERT, newKc006);
                 // 修改库存

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

@@ -12,8 +12,8 @@
         UPDATED_BY as "updatedBy",  <!-- 更新人 -->
         UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
         UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
-        PURCHASE_CODE as "purchaseCode",  <!-- 采购单号 -->
-        OLD_PURCHASE_CODE as "oldPurchaseCode",  <!-- 原采购单号 -->
+        PURCHASE_NO as "purchaseNo",  <!-- 采购单号 -->
+        OLD_PURCHASE_NO as "oldPurchaseNo",  <!-- 原采购单号 -->
         RECEIPT_DATE as "receiptDate",  <!-- 单据日期 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
@@ -55,8 +55,8 @@
         <isNotEmpty prepend=" AND " property="updatedTime">
             UPDATED_TIME = #updatedTime#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="purchaseCode">
-            PURCHASE_CODE = #purchaseCode#
+        <isNotEmpty prepend=" AND " property="purchaseNo">
+            PURCHASE_NO = #purchaseNo#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="receiptDate">
             RECEIPT_DATE = #receiptDate#
@@ -91,8 +91,8 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="oldPurchaseCode">
-            OLD_PURCHASE_CODE = #oldPurchaseCode#
+        <isNotEmpty prepend=" AND " property="oldPurchaseNo">
+            OLD_PURCHASE_NO = #oldPurchaseNo#
         </isNotEmpty>
 	</sql>
 
@@ -123,8 +123,8 @@
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME,  <!-- 创建时间 -->
-            PURCHASE_CODE,  <!-- 采购单号 -->
-            OLD_PURCHASE_CODE,  <!-- 原采购单号 -->
+            PURCHASE_NO,  <!-- 采购单号 -->
+            OLD_PURCHASE_NO,  <!-- 原采购单号 -->
             RECEIPT_DATE,  <!-- 单据日期 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
@@ -138,7 +138,7 @@
             DELETE_FLAG  <!-- 是否删除0.否1.是 -->
         ) VALUES (
             #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#,
-            #oldPurchaseCode#,#purchaseCode#, #receiptDate#, #whCode#, #whName#, #inventType#,
+            #oldPurchaseNo#,#purchaseNo#, #receiptDate#, #whCode#, #whName#, #inventType#,
             #inventCode#, #inventName#, #inventRecordId#, #amount#, #weight#,
             #remarks#, #deleteFlag#
         )

src/main/java/com/baosight/hpjx/hp/kc/tools/HPKCTools.java

@@ -106,7 +106,7 @@ public class HPKCTools {
 		if (CollectionUtils.isEmpty(results)) {
 			return null;
 		}
-		return results.stream().collect(Collectors.toMap(HPKC001::getPurchaseCode, item -> item));
+		return results.stream().collect(Collectors.toMap(HPKC001::getPurchaseNo, item -> item));
 	}
 	
 	/**

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC001.xml

@@ -62,6 +62,9 @@
 		<isNotEmpty prepend=" AND " property="materialStatus">
 			MATERIAL_STATUS = #materialStatus#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
 		<dynamic prepend="ORDER BY">
 			<isEmpty property="orderBy">
 				CREATED_TIME desc

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

@@ -21,7 +21,7 @@ $(function() {
                 },
                 editor: function (container, options) {
                     let inInfo = new EiInfo();
-                    inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+                    inInfo.set("inqu_status-0-inventTypes", [1, 2]);
                     inInfo.set("inqu_status-0-whType", options.model["inventType"]);
                     inInfo.set("serviceName", "HPPZ007");
                     inInfo.set("methodName", "queryComboBox");
@@ -41,7 +41,7 @@ $(function() {
                 },
                 editor: function (container, options) {
                     let inInfo = new EiInfo();
-                    inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+                    inInfo.set("inqu_status-0-inventTypes", [1, 2]);
                     inInfo.set("inqu_status-0-inventType", options.model["inventType"]);
                     inInfo.set("serviceName", "HPPZ006");
                     inInfo.set("methodName", "queryMaterialComboBox");
@@ -50,7 +50,7 @@ $(function() {
                     refreshSelect(container, inInfo);
                 }
             }, {
-                field: "spe",
+                field: "inventRecordId",
                 template: function (dataItem) {
                     for (let i = 0; i < inventAllGlobalData.length; i++) {
                         if (inventAllGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
@@ -61,7 +61,7 @@ $(function() {
                 },
                 editor: function (container, options) {
                     let inInfo = new EiInfo();
-                    inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+                    inInfo.set("inqu_status-0-inventTypes", [1, 2]);
                     inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
                     inInfo.set("serviceName", "HPPZ006");
                     inInfo.set("methodName", "queryComboBoxSpec");
@@ -81,6 +81,20 @@ $(function() {
                 }
             }],
             loadComplete: function (grid) {
+                // 此grid对象
+                grid.dataSource.bind("change", function(e) {
+                    if (e.field == "inventRecordId") {
+                        var tr,index;
+                        // 获取此model元素信息
+                        var item = e.items[0];
+                        for (let i = 0; i < inventAllGlobalData.length; i++) {
+                            if (inventAllGlobalData[i]['valueField'] === item.inventRecordId) {
+                                resultGrid.setCellValue(item, 'material', inventAllGlobalData[i]['param1Field'])
+                                resultGrid.setCellValue(item, 'unit', inventAllGlobalData[i]['param2Field'])
+                            }
+                        }
+                    }
+                });
             }
         }
     }
@@ -98,7 +112,7 @@ $(function() {
 $(window).load(function () {
     // 仓库名称
     let inInfo = new EiInfo();
-    inInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
+    inInfo.set("inqu_status-0-inventTypes", [1, 2]);
     EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
         onSuccess: function (ei) {
             whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();

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

@@ -11,7 +11,7 @@
         <div class="row">
             <EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
                              role="date" format="yyyy-MM-dd" readonly="true"/>
-            <EF:EFInput cname="采购单号" ename="inqu_status-0-chpurchaseCodeeckNo" colWidth="3"/>
+            <EF:EFInput cname="采购单号" ename="inqu_status-0-chpurchaseNoeckNo" colWidth="3"/>
             <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
@@ -36,7 +36,7 @@
     <EF:EFRegion id="result" title="明细信息">
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
-            <EF:EFColumn ename="purchaseCode" cname="采购单号" enable="false" width="140" align="center"/>
+            <EF:EFColumn ename="purchaseNo" cname="采购单号" enable="false" width="140" align="center"/>
             <EF:EFColumn ename="receiptDate" cname="单据日期" width="90" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true">
@@ -44,9 +44,9 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="whCode" cname="仓库名称" width="120" align="center" required="true" readonly="true"/>
             <EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true" readonly="true"/>
-            <EF:EFColumn ename="spec" cname="规格" width="120" align="center"/>
-            <EF:EFColumn ename="material" cname="材质" width="120" align="center"/>
-            <EF:EFColumn ename="unit" cname="单位" width="120" align="center"/>
+            <EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/>
+            <EF:EFColumn ename="material" cname="材质" width="120" align="center" enable="false"/>
+            <EF:EFColumn ename="unit" cname="单位" width="120" align="center" enable="false"/>
             <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right"/>
             <EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="90" align="right"/>
             <EF:EFColumn ename="remark" cname="备注" width="150" readonly="true"/>