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

src/main/java/com/baosight/hpjx/core/dao/DaoUtils.java

@@ -233,7 +233,7 @@ public class DaoUtils {
 		String userId;
 		try {
 			userId = MapUtils.getString(map, "updatedBy");
-			if (StringUtils.isEmpty(userId)) {
+			if (StringUtils.isBlank(userId)) {
 				userId = UserSession.getLoginName();
 				userId = userId == null || userId.length() > 32 ? "System" : userId;
 			}
@@ -244,7 +244,7 @@ public class DaoUtils {
 		// 修改人名称
 		String userName = MapUtils.getString(map, "updatedName");
 		try {
-			if (StringUtils.isEmpty(userName)) {
+			if (StringUtils.isBlank(userName)) {
 				userName = UserSession.getLoginCName();
 			}
 		} catch (Exception e) {

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

@@ -16,7 +16,6 @@ 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.core.util.DateUtils;
-import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
 import org.apache.commons.collections.MapUtils;
@@ -94,8 +93,8 @@ public class ServiceHPKC003 extends ServiceBase {
 				//同步生产计划
 				DaoUtils.update("HPSC004.update",this.synchronousPlan(fKc003));
 				// 修改库存
-				HPKCTools.updateStock(fKc003.getWhCode(), fKc003.getInventRecordId(), fKc003.getAmount().negate(),
-						fKc003.getWeight().negate());
+				HPKCTools.updateStock(fKc003.getWhCode(), fKc003.getInventRecordId(), fKc003.getAmount(),
+						fKc003.getWeight());
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);

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

@@ -198,6 +198,7 @@ public class ServiceHPKC010 extends ServiceBase {
 		hpkc010.setInventType(inventType.toString());
 		hpkc010.setInventCode(inventCode);
 		hpkc010.setInventName(inventName);
+		hpkc010.setVersion(new Integer(1));
 	}
 
 

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

@@ -55,7 +55,7 @@
 			<EF:EFColumn cname="存货名称" ename="inventName" width="120" align="center" enable="false"/>
 			<EF:EFColumn ename="inventRecordId" cname="存货档案ID" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="remark" cname="备注" width="150" editType="textarea" readonly="true"/>
-			<EF:EFColumn cname="原生产单号" ename="prodNoOld" enable="false" width="140" align="center"/>
+			<EF:EFColumn cname="原生产单号" ename="prodNoOld" enable="false" width="140" align="center" hidden="true"/>
 			<EF:EFColumn cname="创建人名称" ename="createdName" enable="false" width="120" align="center"/>
 			<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>

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

@@ -34,7 +34,9 @@
             <EF:EFColumn enable="false" ename="projCode" cname="项目号" />
             <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
             <EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/>
-            <EF:EFColumn enable="false" ename="prdtType" cname="部件类型"/>
+            <EF:EFComboColumn ename="prdtType" cname="部件类型" width="90" align="center" enable="false">
+                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
+            </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/>
             <EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/>
             <EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/>