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

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

@@ -104,7 +104,7 @@ public class ServiceHPKC013 extends ServiceBase {
 					// 修改库存
 					if (hpkc010 != null) {
 						HPKCTools.updateStock(dbKc013.getWhCode(), hpkc010.getInventRecordId(),
-								dbKc013.getAmount(), dbKc013.getWeight().multiply(new BigDecimal(1000)), hpkc010.getFactoryCode());
+								dbKc013.getAmount(), dbKc013.getWeight(), hpkc010.getFactoryCode());
 					} else {
 						HPKCTools.updateProdStock(dbKc013.getWhCode(), dbKc013.getProdNo(),
 								dbKc013.getAmount(), dbKc013.getWeight(), hpkc011.getFactoryCode());
@@ -164,7 +164,7 @@ public class ServiceHPKC013 extends ServiceBase {
 					// 修改库存
 					if (hpkc010 != null) {
 						HPKCTools.updateStock(dbKc013.getWhCode(), hpkc010.getInventRecordId(),
-								newKc013.getAmount(), newKc013.getWeight().multiply(new BigDecimal(1000)), hpkc010.getFactoryCode());
+								newKc013.getAmount(), newKc013.getWeight(), hpkc010.getFactoryCode());
 					} else {
 						HPKCTools.updateProdStock(dbKc013.getWhCode(), dbKc013.getProdNo(),
 								newKc013.getAmount(), newKc013.getWeight(), hpkc011.getFactoryCode());

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

@@ -4,6 +4,7 @@ import com.baosight.hpjx.core.dao.DaoBase;
 import com.baosight.hpjx.core.dao.DaoUtils;
 import com.baosight.hpjx.hp.constant.HPSqlConstant;
 import com.baosight.hpjx.hp.kc.domain.*;
+import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -441,7 +442,7 @@ public class HPKCTools {
 	 * @param weight
 	 */
 	public static void updateStock(String whCode, Long inventRecordId, BigDecimal amount, BigDecimal weight,String factCode) {
-		updateStock(whCode, inventRecordId, amount, BigDecimal.ZERO, weight,factCode);
+		updateStock(whCode, inventRecordId, amount, HPPZTools.HpPz006.calcUnitWeight(inventRecordId), weight,factCode);
 	}
 	
 	/**

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT002.xml

@@ -3,7 +3,7 @@
 <sqlMap namespace="HPMT002">
 
 	<select id="pmProject" resultClass="java.util.HashMap">
-            SELECT * FROM (
+<!--            SELECT * FROM (-->
         SELECT
         ID as "id",
         COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
@@ -43,12 +43,12 @@
              PROJ_NAME LIKE CONCAT('%', #projName#, '%')
             </isNotEmpty>
         order by STATUS,PLAN_COMPLETION_DATE
-            ) AS A WHERE actualCompletionNum!=num
+<!--            ) AS A WHERE actualCompletionNum!=num-->
         limit #offset#, #pageSize#
 	</select>
 
         <select id="pmProjectCount" resultClass="java.util.HashMap">
-                SELECT * FROM (
+<!--                SELECT * FROM (-->
                 SELECT
                 ID as "id",
                 COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
@@ -88,7 +88,7 @@
                         PROJ_NAME LIKE CONCAT('%', #projName#, '%')
                 </isNotEmpty>
                 order by STATUS,PLAN_COMPLETION_DATE
-                ) AS A WHERE actualCompletionNum!=num
+             <!--   ) AS A WHERE actualCompletionNum!=num-->
         </select>
 
         <select id="pmQuality" resultClass="java.util.HashMap">