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

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

@@ -3,7 +3,6 @@ package com.baosight.hggp.hg.kc.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.common.InventTypeDetailEnum;
-import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.enums.DeleteFlagEnum;
 import com.baosight.hggp.core.security.UserSessionUtils;
@@ -28,7 +27,6 @@ import org.apache.commons.collections.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author:songx

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004A.xml

@@ -546,15 +546,15 @@
 		a.product_name	as "productName",  <!-- 产品名称 -->
 		a.invent_type		as "inventType",  <!-- 档案类型 -->
 		a.invent_source as "inventSource", <!-- 物料来源 1加工 2外购 -->
-		a.spec as "spec",
-		a.length	as "length",  <!-- 长 -->
-		a.width	as "width",  <!-- 宽 -->
-		a.thick	as "thick",  <!-- 厚 -->
+		c.spec as "spec",
+		c.length	as "length",  <!-- 长 -->
+		c.width	as "width",  <!-- 宽 -->
+		c.thick	as "thick",  <!-- 厚 -->
 		a.product_status	as "productStatus",  <!-- 产品状态 0:未提交，1:已提交 -->
 		a.change_type	as "changeType",  <!-- 变更类型:默认0,1:增加，2:替换，3:删除 -->
-		a.quantity	as "quantity",  <!-- 数量 -->
-		a.single_weight	as "singleWeight",  <!-- 单重 -->
-		a.total_weight	as "totalWeight",  <!-- 总重 -->
+		c.INV_QTY	as "quantity",  <!-- 数量 -->
+		c.INV_UNIT_WEIGHT	as "singleWeight",  <!-- 单重 -->
+		c.INV_WEIGHT	as "totalWeight",  <!-- 总重 -->
 		a.approval_status	as "approvalStatus",  <!-- 审批状态	0:待审；1:审核中；2:已审 -->
 		a.leaf as "leaf",  <!-- 是否有叶子节点 -->
 		a.sort as "sort",  <!-- 排序字段 -->
@@ -567,7 +567,8 @@
 		a.updated_name	as "updatedName",  <!-- 修改人名称 -->
 		a.updated_time	as "updatedTime" <!-- 更新时间 -->
 		FROM ${hggpSchema}.HGSC004A a
-		left join ${hggpSchema}.HGSC004 b on a.material_id = b.id
+		join ${hggpSchema}.HGSC004 b on a.material_id = b.id
+		join ${hggpSchema}.hgkc010 c on a.product_code = c.invent_code and a.company_code = c.company_code
 		WHERE 1=1
 		and a.lv = 4
 		and b.material_status = 2
@@ -594,11 +595,12 @@
 		<isNotEmpty prepend=" AND " property="ids">
 			a.id IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
 		</isNotEmpty>
-		<dynamic prepend="ORDER BY">
-			<isNotEmpty property="orderBy">
-				$orderBy$
+		<isNotEmpty prepend=" AND " property="whName">
+			c.wh_name like CONCAT('%', #whName#, '%')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whCode">
+			c.wh_code = #whCode#
 		</isNotEmpty>
-		</dynamic>
 		<dynamic prepend="ORDER BY">
 			<isNotEmpty property="orderBy">
 				$orderBy$

src/main/webapp/HG/KC/HGKC008D.jsp

@@ -11,7 +11,7 @@
 		<EF:EFInput ename="inqu_status-0-companyName" cname="公司编号" colWidth="3" type="hidden"/>
 		<EF:EFInput ename="inqu_status-0-receiveId" cname="领料单id" colWidth="3" type="hidden"/>
 		<EF:EFInput ename="inqu_status-0-projCode" cname="项目编号" colWidth="3" type="hidden"/>
-		<EF:EFInput ename="inqu_status-0-whName" cname="仓库名称" colWidth="3" type="hidden"/>
+		<EF:EFInput ename="inqu_status-0-whCode" cname="仓库编号" colWidth="3" type="hidden"/>
 		<div class="row">
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
 			<EF:EFInput cname="仓库名称" ename="whName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>