Merge branch 'dev' of ssh://10.70.33.7:32359/smart/hp-smart into dev

src/main/java/com/baosight/hpjx/common/InventTypeEnum.java

@@ -58,6 +58,10 @@ public enum InventTypeEnum {
         this.value = value;
     }
 
+    public static Integer[] getProdTypes(){
+        return new Integer[]{SEMI_FINISHED_PRODUCT.code,FINISHED_PRODUCT.code};
+    }
+
     public static EiBlock generatorEiBlock() {
         EiBlock block = new EiBlock("customer_type_block_id");
         List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{

src/main/java/com/baosight/hpjx/core/api/BaiDuApi.java

@@ -19,57 +19,57 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class BaiDuApi {
 	
-	// 鉴权接口
-	private static final String TOKEN_URL = "https://aip.baidubce.com/oauth/2.0/token";
-	// 标准版接口地址
-	private static final String BASIC_URL = "https://aip.baidubce.com/rest/2.0/ocr/v1/general_basic";
-	// 办公文档版接口地址
-	private static final String OFFICE_URL = "https://aip.baidubce.com/rest/2.0/ocr/v1/doc_analysis_office";
-	// Api Key
-	private static final String API_KEY = "dkXgTCScKjfMmL7oCzAIFdgZ";
-	// Secret Key
-	private static final String SECRET_KEY = "xP5V9k23KBNHOyzc0rYkm00GdQMMxvEh";
-	
-	/**
-	 * 获取TOKEN
-	 *
-	 * @return
-	 */
-	public static String getToken() {
-		return SingletonHolder.TOKEN;
-	}
-	
-	/**
-	 * 刷新TOKEN
-	 *
-	 * @return
-	 */
-	public static void refreshToken() {
-		SingletonHolder.refresh();
-	}
-	
-	public static void main(String[] args) throws IOException {
-//		String filePath = "e:/10001.jpg";
-		String filePath = "e:/新年贺词.pdf";
-		docAnalysisOffice(filePath);
-	}
-	
-	/**
-	 * 解析办公文档
-	 *
-	 * @param filePath 本地文件地址
-	 */
-	public static void docAnalysisOffice(String filePath) throws IOException {
-		byte[] fileBytes = FileUtils.readByBytes(filePath);
-		String fileBase64 = Base64Utils.encode(fileBytes);
-		String fileEncoder = URLEncoder.encode(fileBase64, "UTF-8");
-		String param = "pdf_file_num=2&image=" + fileEncoder;
-		Map<String, String> header = new HashMap<>();
-		header.put("Content-Type", "application/x-www-form-urlencoded");
-		String url = OFFICE_URL + "?access_token=" + getToken();
-		String result = HttpUtils.post(url, header, param, HttpUtils.FORM_MEDIA_TYPE);
-		log.info("result->{}", result);
-	}
+//	// 鉴权接口
+//	private static final String TOKEN_URL = "https://aip.baidubce.com/oauth/2.0/token";
+//	// 标准版接口地址
+//	private static final String BASIC_URL = "https://aip.baidubce.com/rest/2.0/ocr/v1/general_basic";
+//	// 办公文档版接口地址
+//	private static final String OFFICE_URL = "https://aip.baidubce.com/rest/2.0/ocr/v1/doc_analysis_office";
+//	// Api Key
+//	private static final String API_KEY = "dkXgTCScKjfMmL7oCzAIFdgZ";
+//	// Secret Key
+//	private static final String SECRET_KEY = "xP5V9k23KBNHOyzc0rYkm00GdQMMxvEh";
+//
+//	/**
+//	 * 获取TOKEN
+//	 *
+//	 * @return
+//	 */
+//	public static String getToken() {
+//		return SingletonHolder.TOKEN;
+//	}
+//
+//	/**
+//	 * 刷新TOKEN
+//	 *
+//	 * @return
+//	 */
+//	public static void refreshToken() {
+//		SingletonHolder.refresh();
+//	}
+//
+//	public static void main(String[] args) throws IOException {
+////		String filePath = "e:/10001.jpg";
+//		String filePath = "e:/新年贺词.pdf";
+//		docAnalysisOffice(filePath);
+//	}
+//
+//	/**
+//	 * 解析办公文档
+//	 *
+//	 * @param filePath 本地文件地址
+//	 */
+//	public static void docAnalysisOffice(String filePath) throws IOException {
+//		byte[] fileBytes = FileUtils.readByBytes(filePath);
+//		String fileBase64 = Base64Utils.encode(fileBytes);
+//		String fileEncoder = URLEncoder.encode(fileBase64, "UTF-8");
+//		String param = "pdf_file_num=2&image=" + fileEncoder;
+//		Map<String, String> header = new HashMap<>();
+//		header.put("Content-Type", "application/x-www-form-urlencoded");
+//		String url = OFFICE_URL + "?access_token=" + getToken();
+//		String result = HttpUtils.post(url, header, param, HttpUtils.FORM_MEDIA_TYPE);
+//		log.info("result->{}", result);
+//	}
 	
 	/**
 	 * 静态内部类用于初始化
@@ -79,38 +79,38 @@ public class BaiDuApi {
 	 */
 	private static class SingletonHolder {
 		
-		/**
-		 * 默认DAO
-		 */
-		private static String TOKEN = "24.717d5b52074bdf31d0377a4afa6c97d6.2592000.1709101017.282335-48528257";//getToken();
-		
-		/**
-		 * 获取TOKEN
-		 *
-		 * @return
-		 * @throws IOException
-		 */
-		private static String getToken() {
-			try {
-				String url = String.format("%s?client_id=%s&client_secret=%s&grant_type=client_credentials",
-						TOKEN_URL, API_KEY, SECRET_KEY);
-				String result = HttpUtils.post(url);
-				JSONObject resultJson = JSONObject.parseObject(result);
-				return resultJson.getString("access_token");
-			} catch (Exception e) {
-				log.error("获取百度API的TOKEN失败：{}", e.getMessage(), e);
-			}
-			return null;
-		}
-		
-		/**
-		 * 刷新TOKEN
-		 *
-		 * @return
-		 */
-		public static void refresh() {
-			TOKEN = getToken();
-		}
+//		/**
+//		 * 默认DAO
+//		 */
+//		private static String TOKEN = "24.717d5b52074bdf31d0377a4afa6c97d6.2592000.1709101017.282335-48528257";//getToken();
+//
+//		/**
+//		 * 获取TOKEN
+//		 *
+//		 * @return
+//		 * @throws IOException
+//		 */
+//		private static String getToken() {
+//			try {
+//				String url = String.format("%s?client_id=%s&client_secret=%s&grant_type=client_credentials",
+//						TOKEN_URL, API_KEY, SECRET_KEY);
+//				String result = HttpUtils.post(url);
+//				JSONObject resultJson = JSONObject.parseObject(result);
+//				return resultJson.getString("access_token");
+//			} catch (Exception e) {
+//				log.error("获取百度API的TOKEN失败：{}", e.getMessage(), e);
+//			}
+//			return null;
+//		}
+//
+//		/**
+//		 * 刷新TOKEN
+//		 *
+//		 * @return
+//		 */
+//		public static void refresh() {
+//			TOKEN = getToken();
+//		}
 		
 	}
 	

src/main/java/com/baosight/hpjx/hp/constant/HPSqlConstant.java

@@ -165,6 +165,18 @@ public class HPSqlConstant {
 	}
 
 	/**
+	 * HPKC011 SQL 定义
+	 *
+	 * @author:songx
+	 * @date:2024/1/20,16:45
+	 */
+	public class HPKC011 {
+
+		// 锁
+		public static final String LOCK = "HPKC011.lock";
+	}
+	
+	/**
 	 * HPPZ010 SQL 定义
 	 *
 	 * @author:songx

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

+package com.baosight.hpjx.hp.kc.service;
+
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.InventTypeEnum;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.security.UserSessionUtils;
+import com.baosight.hpjx.hp.kc.domain.HPKC011;
+import com.baosight.hpjx.hp.pz.domain.HPPZ006;
+import com.baosight.hpjx.hp.pz.domain.HPPZ007;
+import com.baosight.hpjx.hp.sc.domain.HPSC005;
+import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.core.service.soa.XLocalManager;
+import com.baosight.iplat4j.core.util.DateUtils;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ *
+ * @author:wwl
+ * @date:2024/1/23,10:51
+ */
+public class ServiceHPKC011 extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo initLoad(EiInfo inInfo) {
+		HPKC011 HPKC011 = new HPKC011();
+		EiInfo outInfo = super.initLoad(inInfo, HPKC011);
+		outInfo.getBlock(EiConstant.resultBlock).getRows().clear();
+		Map paramMap = new HashMap<String,Object>(){{
+			put("inventTypes", InventTypeEnum.getProdTypes());
+		}};
+		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), paramMap);
+		CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), paramMap);
+		return outInfo;
+	}
+	
+	/**
+	 * 查询操作.
+	 */
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			inInfo = super.query(inInfo, "HPKC011.query", new HPKC011());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+	
+
+	/**
+	 * 新增操作.
+	 */
+	@Override
+	public EiInfo insert(EiInfo inInfo) {
+		try {
+			CommonMethod.creatorInfo(inInfo, EiConstant.resultBlock);
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HPKC011 fKc010 = new HPKC011();
+				fKc010.fromMap(resultRows.get(i));
+				// 设置基础信息
+				DaoUtils.insert(HPKC011.INSERT, fKc010);
+			}
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "新增失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 更新库存
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo updateStock(EiInfo inInfo){
+		String whCode = inInfo.getString("whCode");
+		String prodNo = inInfo.getString("prodNo");
+		BigDecimal amount = new BigDecimal(inInfo.getString("amount"));
+		BigDecimal weight = new BigDecimal(inInfo.getString("weight"));
+		String companyCode = UserSessionUtils.getCompanyCode();
+		try {
+			checkUpdateStockParam(companyCode,whCode,prodNo,amount,weight);
+			HPKC011 newObj = generatorBaseInfo(companyCode,whCode,prodNo,amount,weight);
+			List<Map> list = dao.query("HPKC011.queryByCondition",new HashMap<String,Object>(){{
+				put("companyCode",companyCode);
+				put("whCode",whCode);
+				put("prodNo",prodNo);
+			}});
+			if(CollectionUtils.isEmpty(list)){
+				//新增
+				if(amount.compareTo(BigDecimal.ZERO)<0
+						||weight.compareTo(BigDecimal.ZERO)<0){
+					throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！");
+				}
+				generatorBaseInfo(newObj);
+				DaoUtils.insert("HPKC011.insert",newObj);
+			}else{
+				//修改
+				HPKC011 oldObj = new HPKC011();
+				oldObj.fromMap(list.get(0));
+				BigDecimal afterAmout = oldObj.getAmount().add(amount);
+				BigDecimal afterWeight = oldObj.getWeight().add(weight);
+				if(afterAmout.compareTo(BigDecimal.ZERO)<0||afterWeight.compareTo(BigDecimal.ZERO)<0){
+					throw new PlatException("库存更新失败,出库数量与重量不能大于当前库存！");
+				}
+				oldObj.setAmount(afterAmout);
+				oldObj.setWeight(afterWeight);
+				oldObj.setUpdatedBy(newObj.getUpdatedBy());
+				oldObj.setUpdatedName(newObj.getUpdatedName());
+				oldObj.setUpdatedTime(newObj.getUpdatedTime());
+				int result = DaoUtils.update("HPKC011.updateStock",oldObj);
+				if(result!=1){
+					throw new PlatException("库存更新失败，库存已发生变更或系统异常，请重试！");
+				}
+			}
+			inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+			inInfo.setMsg("库存更新成功！");
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "库存更新失败!");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 生成库存对象
+	 * @param companyCode
+	 * @param whCode
+	 * @param prodNo
+	 * @param amout
+	 * @param weight
+	 * @reutrn HPKC011
+	 */
+	private HPKC011 generatorBaseInfo(String companyCode, String whCode, String prodNo, BigDecimal amout, BigDecimal weight) {
+		HPKC011 hpkc011 = new HPKC011();
+		hpkc011.setCompanyCode(companyCode);
+		hpkc011.setWhCode(whCode);
+		hpkc011.setProdNo(prodNo);
+		hpkc011.setAmount(amout);
+		hpkc011.setWeight(weight);
+		String userId = UserSession.getLoginName();
+		String userName = UserSession.getLoginCName();
+		String time = DateUtils.curDateTimeStr14();
+		hpkc011.setCreatedBy(userId);
+		hpkc011.setCreatedName(userName);
+		hpkc011.setCreatedTime(time);
+		hpkc011.setUpdatedBy(userId);
+		hpkc011.setUpdatedName(userName);
+		hpkc011.setUpdatedTime(time);
+		return hpkc011;
+	}
+
+	private void generatorBaseInfo(HPKC011 hpkc011) {
+		EiInfo inInfo = new EiInfo();
+		try {
+			inInfo.set("whCode", hpkc011.getWhCode());
+			inInfo.set(EiConstant.serviceName, "HPPZ007");
+			inInfo.set(EiConstant.methodName, "queryByWhCode");
+			EiInfo outInfo = XLocalManager.call(inInfo);
+			List<HPPZ007> whNameList = (List) outInfo.get("list");
+			hpkc011.setWhName(whNameList.get(0).getWhName());
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo, e, "库存更新失败!");
+			throw new PlatException("仓库编码异常，找不到对应的仓库档案！");
+		}
+		try {
+			inInfo.setRows(EiConstant.queryBlock,new ArrayList(){{add(new HashMap<String,Object>(){{put("prodNo",hpkc011.getProdNo());}});}});
+			inInfo.set(EiConstant.serviceName, "HPSC005");
+			inInfo.set(EiConstant.methodName, "query");
+			EiInfo outInfo = XLocalManager.call(inInfo);
+			HPSC005 hpsc005 = new HPSC005();
+			List<Map> inventList =  outInfo.getBlock(EiConstant.resultBlock).getRows();
+			hpsc005.fromMap(inventList.get(0));
+			hpkc011.setProjCode(hpsc005.getProjCode());
+			hpkc011.setProjName(hpsc005.getProjName());
+			hpkc011.setInventCode(hpsc005.getPrdtCode());
+			hpkc011.setInventName(hpsc005.getPrdtName());
+			hpkc011.setSubInventCode(hpsc005.getPartCode());
+			hpkc011.setSubInventName(hpsc005.getPartName());
+			hpkc011.setLength(hpsc005.getPartLength());
+			hpkc011.setWidth(hpsc005.getPartWidth());
+			hpkc011.setThick(hpsc005.getPartThick());
+			hpkc011.setUnitWeight(hpsc005.getUnitWt());
+			hpkc011.setRemark(hpsc005.getRemark1());
+		}catch (Exception e){
+			LogUtils.setDetailMsg(inInfo, e, "库存更新失败!");
+			throw new PlatException("生产单号异常，找不到对应的生产订单！");
+		}
+		hpkc011.setVersion(new Integer(1));
+	}
+
+
+	/**
+	 * 校验库存变更请求参数
+	 * @param companyCode
+	 * @param whCode
+	 * @param prodNo
+	 * @param amout
+	 * @param weight
+	 */
+	private void checkUpdateStockParam(String companyCode, String whCode, String prodNo
+			, BigDecimal amout, BigDecimal weight){
+		if(StringUtils.isBlank(companyCode)){
+			throw new PlatException("企业编码不能为空！");
+		}
+		if(StringUtils.isBlank(whCode)){
+			throw new PlatException("仓库编码不能为空！");
+		}
+		if(StringUtils.isBlank(prodNo)){
+			throw new PlatException("生产单号不能为空！");
+		}
+		if(Objects.isNull(amout)||
+				Objects.isNull(amout)){
+			throw new PlatException("库存变更数量或重量不能为空！");
+		}
+		if(amout.compareTo(BigDecimal.ZERO)==0
+				&&weight.compareTo(BigDecimal.ZERO)==0){
+			throw new PlatException("库存变更数量或重量不能为0)！");
+		}
+	}
+	
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<sqlMap namespace="HPKC011">
+
+    <sql id="column">
+        ID as "id",
+        COMPANY_CODE as "companyCode",  <!-- 企业编码 -->
+        DEP_CODE as "depCode",  <!-- 部门编码 -->
+        WH_CODE as "whCode",  <!-- 仓库编码 -->
+        WH_NAME as "whName",  <!-- 仓库名称 -->
+        PROD_NO as "prodNo",  <!-- 生产单号 -->
+        PROJ_CODE as "projCode",  <!-- 生产单号 -->
+        PROJ_NAME as "projName",  <!-- 生产单号 -->
+        INVENT_CODE as "inventCode",  <!-- 部件编码 -->
+        INVENT_NAME as "inventName",  <!-- 部件名称 -->
+        SUB_INVENT_CODE as "subInventCode",  <!-- 零部件编码 -->
+        SUB_INVENT_NAME as "subInventName",  <!-- 零部件名称 -->
+        LENGTH as "length",  <!-- 长 -->
+        WIDTH as "width",  <!-- 宽 -->
+        THICK as "thick",  <!-- 厚 -->
+        AMOUNT as "amount",  <!-- 数量 -->
+        UNIT_WEIGHT as "unitWeight",  <!-- 单重 -->
+        WEIGHT as "weight",  <!-- 重量 -->
+        REMARK as "remark",  <!-- 备注 -->
+        CREATED_BY as "createdBy",  <!-- 创建人 -->
+        CREATED_NAME as "createdName",  <!-- 创建人名称 -->
+        CREATED_TIME as "createdTime",  <!-- 创建时间 -->
+        UPDATED_BY as "updatedBy",  <!-- 更新人 -->
+        UPDATED_NAME as "updatedName",  <!-- 更新人名称 -->
+        UPDATED_TIME as "updatedTime",  <!-- 更新时间 -->
+        VERSION as "version" <!-- 版本号 -->
+    </sql>
+
+	<sql id="condition">
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="whCode">
+			WH_CODE = #whCode#
+		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="whName">
+            WH_NAME LIKE '%' || #whName# || '%'
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="prodNo">
+            PROD_NO = #prodNo#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="projCode">
+            PROJ_CODE = #projCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="projName">
+            PROJ_NAME LIKE '%' || #projName# || '%'
+        </isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventCode">
+            INVENT_CODE = #inventCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="inventName">
+            INVENT_NAME = #inventName#
+		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="subInventCode">
+            SUB_INVENT_CODE = #subInventCode#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="subInventName">
+            SUB_INVENT_NAME = #subInventName#
+        </isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedBy">
+			UPDATED_BY = #updatedBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="updatedTime">
+			UPDATED_TIME = #updatedTime#
+		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="version">
+            VERSION = #version#
+        </isNotEmpty>
+
+    </sql>
+
+    <sql id="customCondition">
+        <isNotEmpty prepend=" AND " property="ids">
+            ID IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
+        </isNotEmpty>
+    </sql>
+
+	<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC011">
+		SELECT <include refid="column"/>
+		FROM hpjx.T_HPKC011
+        WHERE 1=1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
+		<dynamic prepend="ORDER BY">
+			<isNotEmpty property="orderBy">
+    		  $orderBy$
+			</isNotEmpty>
+			<isEmpty property="orderBy">
+    		  ID DESC
+			</isEmpty>
+		</dynamic>
+	</select>
+
+    <select id="queryByCondition" resultClass="java.util.HashMap">
+        SELECT <include refid="column"/>
+        FROM hpjx.T_HPKC011
+        WHERE 1=1
+        <include refid="condition"/>
+        <include refid="customCondition"/>
+    </select>
+
+	<select id="count" resultClass="int">
+		SELECT COUNT(*) FROM hpjx.T_HPKC011
+        WHERE 1=1
+		<include refid="condition"/>
+        <include refid="customCondition"/>
+	</select>
+
+	<insert id="insert">
+		INSERT INTO hpjx.T_HPKC011 (
+            COMPANY_CODE,  <!-- 企业编码 预留 -->
+            DEP_CODE,  <!-- 部门编码 -->
+            WH_CODE,  <!-- 仓库编码 -->
+            WH_NAME,  <!-- 仓库名称 -->
+            PROD_NO,  <!-- 生产单号 -->
+            PROJ_CODE,  <!-- 生产单号 -->
+            PROJ_NAME,  <!-- 生产单号 -->
+            INVENT_CODE,  <!-- 部件编码 -->
+            INVENT_NAME,  <!-- 部件名称 -->
+            SUB_INVENT_CODE,  <!-- 零部件编码 -->
+            SUB_INVENT_NAME,  <!-- 零部件名称 -->
+            LENGTH,  <!-- 长 -->
+            WIDTH,  <!-- 宽 -->
+            THICK,  <!-- 厚 -->
+            AMOUNT,  <!-- 数量 -->
+            UNIT_WEIGHT,  <!-- 单重 -->
+            WEIGHT,  <!-- 重量 -->
+            REMARK,  <!-- 备注 -->
+            CREATED_BY,  <!-- 创建人 -->
+            CREATED_TIME,  <!-- 创建时间 -->
+            UPDATED_BY,  <!-- 更新人 -->
+            UPDATED_TIME,  <!-- 更新时间 -->
+            VERSION
+        ) VALUES (
+            #companyCode#, #depCode#, #whCode#, #whName#, #prodNo#, #projCode#, #projName#,
+            #inventCode#, #inventName#, #subInventCode#, #subInventName#, #length#, #width#, #thick#,
+            #amount#, #unitWeight#, #weight#, #remark#,
+            #createdBy#, #createdTime#, #updatedBy#,
+            #updatedTime#, #version#
+        )
+	</insert>
+
+
+    <update id="updateStock">
+        UPDATE hpjx.T_HPKC011
+        SET
+        AMOUNT = #amount#,   <!-- 数量 -->
+        WEIGHT = #weight#,   <!-- 重量 -->
+        UPDATED_BY = #updatedBy#,   <!-- 更新人 -->
+        UPDATED_NAME = #updatedName#,   <!-- 更新人 -->
+        UPDATED_TIME = #updatedTime#,   <!-- 更新时间 -->
+        VERSION = VERSION+1
+        WHERE ID = #id#
+        AND VERSION = #version#
+    </update>
+
+    <!-- 行锁 -->
+    <update id="lock">
+        UPDATE ${hpjxSchema}.T_HPKC011
+        SET CREATED_TIME = CREATED_TIME
+        WHERE 1=1
+        <isNotEmpty prepend=" AND " property="id">
+            ID = #id#
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="ids">
+            ID IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
+        </isNotEmpty>
+    </update>
+</sqlMap>

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

@@ -403,4 +403,74 @@ public class HPKCTools {
 		}
 	}
 
+
+	/**
+	 * 查询产品库存信息
+	 *
+	 * @param ids
+	 * @return
+	 */
+	public static List<HPKC011> listKc011(List<Long> ids) {
+		if (CollectionUtils.isEmpty(ids)) {
+			return null;
+		}
+		Map queryMap = new HashMap();
+		queryMap.put("ids", ids);
+		return DaoBase.getInstance().query(HPKC011.QUERY, queryMap);
+	}
+
+	/**
+	 * 查询产品库存信息
+	 *
+	 * @param ids
+	 * @return
+	 */
+	public static Map<Long, HPKC011> mapKc011(List<Long> ids) {
+		List<HPKC011> results = listKc011(ids);
+		if (CollectionUtils.isEmpty(results)) {
+			return null;
+		}
+		return results.stream().collect(Collectors.toMap(HPKC011::getId, item -> item));
+	}
+
+	/**
+	 * 锁
+	 *
+	 * @param ids
+	 * @return
+	 */
+	public static void lockKc011(List<Long> ids) {
+		if (CollectionUtils.isEmpty(ids)) {
+			return;
+		}
+		Map queryMap = new HashMap();
+		queryMap.put("ids", ids);
+		DaoBase.getInstance().update(HPSqlConstant.HPKC011.LOCK, queryMap);
+	}
+
+	/**
+	 * 更新产品库存
+	 *
+	 * @param whCode
+	 * @param prodNo
+	 * @param amount
+	 * @param weight
+	 */
+	public static void updateProdStock(String whCode, String prodNo, BigDecimal amount, BigDecimal weight) {
+		if (amount.compareTo(BigDecimal.ZERO) == 0 && weight.compareTo(BigDecimal.ZERO) == 0) {
+			return;
+		}
+		EiInfo inInfo = new EiInfo();
+		inInfo.set("whCode", whCode);
+		inInfo.set("prodNo", prodNo);
+		inInfo.set("amount", amount);
+		inInfo.set("weight", weight);
+		inInfo.set(EiConstant.serviceName, "HPKC011");
+		inInfo.set(EiConstant.methodName, "updateStock");
+		EiInfo outInfo = XLocalManager.call(inInfo);
+		if (outInfo.getStatus() < 0) {
+			throw new PlatException("跟新库存失败：" + outInfo.getMsg());
+		}
+	}
+	
 }

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java

@@ -200,13 +200,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 			hppz006.setCoefficient(new BigDecimal(coefficient));
 			hppz006.setUnit(unit);
 			hppz006.setStatus(CommonConstant.YesNo.YES_1.intValue());
-			StringBuffer sepbuf = new StringBuffer();
-			if(Objects.nonNull(length)){sepbuf.append(length).append("*");}
-			if(Objects.nonNull(width)){sepbuf.append(width).append("*");}
-			if(Objects.nonNull(thick)){sepbuf.append(thick);}
-			if(StringUtils.isNotEmpty(sepbuf.toString())){
-				hppz006.setSpec(sepbuf.toString());
-			}
+			hppz006.setSpec(HPPZTools.jointSpec(hppz006.getLength(),hppz006.getWidth(),hppz006.getThick()));
 			DaoUtils.insert(HPPZ006.INSERT, hppz006);
 		}
 		inInfo.setAttr(new HashMap(){{put("obj",hppz006);}});

src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java

 package com.baosight.hpjx.hp.pz.tools;
 
-import com.baosight.eplat.utils.StringUtils;
 import com.baosight.hpjx.common.InventTypeEnum;
 import com.baosight.hpjx.core.constant.CommonConstant;
 import com.baosight.hpjx.core.dao.DaoBase;
@@ -15,6 +14,7 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.soa.XLocalManager;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -170,15 +170,15 @@ public class HPPZTools {
 	public static String jointSpec(BigDecimal length, BigDecimal width, BigDecimal thick) {
 		StringBuffer sb = new StringBuffer();
 		if (length != null && length.compareTo(BigDecimal.ZERO) != 0) {
-			sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(length));
+			sb.append(length.toString());
 			sb.append("*");
 		}
 		if (width != null && width.compareTo(BigDecimal.ZERO) != 0) {
-			sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(width));
+			sb.append(width.toString());
 			sb.append("*");
 		}
 		if (thick != null && thick.compareTo(BigDecimal.ZERO) != 0) {
-			sb.append(com.baosight.iplat4j.core.util.StringUtils.toString(thick));
+			sb.append(thick.toString());
 		}
 		return sb.toString();
 	}

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC005.java

@@ -32,6 +32,7 @@ public class HPSC005 extends DaoEPBase {
 	public static final String FIELD_PRDT_NAME = "prdtName";    		/* 部件名称*/
 	public static final String FIELD_PLAN_COMPLETION_DATE = "planCompletionDate";    		/* 计划完成日期*/
 	public static final String FIELD_NUM = "num";    		/* 计划数量*/
+	public static final String FIELD_UNIT_WT = "unitWt";    		/* 单重*/
 	public static final String FIELD_TOTAL_WT = "totalWt";    		/* 计划重量*/
 	public static final String FIELD_STATUS = "status";    		/* 状态   0-未派工，1-已派工*/
 	public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
@@ -59,6 +60,8 @@ public class HPSC005 extends DaoEPBase {
 	public static final String COL_PRDT_NAME = "PRDT_NAME";    		/* 部件名称*/
 	public static final String COL_PLAN_COMPLETION_DATE = "PLAN_COMPLETION_DATE";    		/* 计划完成日期*/
 	public static final String COL_NUM = "NUM";    		/* 计划数量*/
+	public static final String COL_UNIT_WT = "UNIT_WT";    		/* 单重*/
+
 	public static final String COL_TOTAL_WT = "TOTAL_WT";    		/* 计划重量*/
 	public static final String COL_STATUS = "STATUS";    		/* 状态   0-未派工，1-已派工*/
 	public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
@@ -92,6 +95,8 @@ public class HPSC005 extends DaoEPBase {
 	private String prdtName = " ";		/* 部件名称*/
 	private String planCompletionDate = " ";		/* 计划完成日期*/
 	private BigDecimal num = new BigDecimal(0.000);			/* 计划数量*/
+	private BigDecimal unitWt = new BigDecimal(0.000);		/* 单重*/
+
 	private BigDecimal totalWt = new BigDecimal(0.000);		/* 计划重量*/
 	private Integer status = new Integer(0);		/* 状态   0-未派工，1-已派工*/
 	private String orgNo = " ";		/* 生产组编码*/
@@ -170,6 +175,13 @@ public class HPSC005 extends DaoEPBase {
 		eiColumn.setDescName("计划数量");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_UNIT_WT);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(15);
+		eiColumn.setDescName("计划单重");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_TOTAL_WT);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
@@ -303,6 +315,22 @@ public class HPSC005 extends DaoEPBase {
 		eiColumn.setDescName("产品-厚");
 		eiMetadata.addMeta(eiColumn);
 	}
+	/**
+	 * get the unitWt - 单重.
+	 * @return the unitWt
+	 */
+	public BigDecimal getUnitWt() {
+		return this.unitWt;
+	}
+
+	/**
+	 * set the unitWt - 单重.
+	 *
+	 * @param unitWt - 单重
+	 */
+	public void setUnitWt(BigDecimal unitWt) {
+		this.unitWt = unitWt;
+	}
 	public String getRemark1() {
 		return this.remark1;
 	}
@@ -906,6 +934,7 @@ public class HPSC005 extends DaoEPBase {
 		setPartLength(NumberUtils.toBigDecimal(StringUtils.toString(map.get("partLength")), partLength));
 		setPartWidth(NumberUtils.toBigDecimal(StringUtils.toString(map.get("partWidth")), partWidth));
 		setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get("partThick")), partThick));
+		setUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UNIT_WT)), unitWt));
 
 	}
 
@@ -954,6 +983,7 @@ public class HPSC005 extends DaoEPBase {
 		map.put("partLength", StringUtils.toString(partLength, eiMetadata.getMeta("partLength")));
 		map.put("partWidth", StringUtils.toString(partWidth, eiMetadata.getMeta("partWidth")));
 		map.put("partThick", StringUtils.toString(partThick, eiMetadata.getMeta("partThick")));
+		map.put(FIELD_UNIT_WT, StringUtils.toString(unitWt, eiMetadata.getMeta(FIELD_UNIT_WT)));
 
 		return map;
 	}

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java

@@ -403,6 +403,7 @@ public class ServiceHPSC002 extends ServiceBase {
             HPSC004.setRemark(HPSC002.getRemark());
             HPSC004.setNum(HPSC002.getNum());
             HPSC004.setUnitWt(HPSC002.getUnitWt());
+            HPSC004.setTotalWt(HPSC002.getTotalWt());
             HPSC004.setFilePath1(HPSC002.getId().toString());
             HPSC004.setPlanCommentDate("");
             HPSC004.setPlanCompletionDate("");

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java

@@ -227,7 +227,8 @@ public class ServiceHPSC003 extends ServiceBase {
                 HPSC005.setRemark1(HPSC004.getRemark());
                 HPSC005.setPlanCompletionDate(HPSC004.getPlanCompletionDate());
                 HPSC005.setNum(HPSC004.getNum());
-                HPSC005.setTotalWt(HPSC004.getUnitWt());
+                HPSC005.setUnitWt(HPSC004.getUnitWt());
+                HPSC005.setTotalWt(HPSC004.getTotalWt());
                 HPSC005.setStatus(0);
                 HPSC005.setFilePath1(HPSC004.getFilePath1());
                 DaoUtils.insert("HPSC005.insert", HPSC005.toMap());

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC098.java

@@ -26,7 +26,7 @@ public class ServiceHPSC098 extends ServiceBase {
         EiInfo outInfo = new EiInfo();
         outInfo.set("inqu_status-0-companyCode", UserSessionUtils.getCompanyCode());
         outInfo.set("inqu_status-0-orgCname", inInfo.get("inqu_status-0-orgCname"));
-        outInfo = super.query(outInfo, "XSOG0801.queryOrgList", new XSOG01());
+        outInfo = super.query(outInfo, "HPPZ011.query", new XSOG01());
         EiBlock r3Block = new EiBlock("result");
         r3Block.setRows(outInfo.getBlock(EiConstant.resultBlock).getRows());
         outInfo.addBlock(r3Block);
@@ -42,7 +42,7 @@ public class ServiceHPSC098 extends ServiceBase {
         HashMap params = new HashMap();
         params.put("orgCname",inInfo.get("inqu_status-0-orgCname"));
         params.put("companyCode", UserSessionUtils.getCompanyCode());
-        List list = dao.query("XSOG0801.queryOrgList",params,0,-999999);
+        List list = dao.query("query.query",params,0,-999999);
         outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(XSOG01.eiMetadata);
         outInfo.addBlock(EiConstant.resultBlock).addRows(list);
         outInfo.getBlock(EiConstant.resultBlock).set("limit", list.size());

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

@@ -123,6 +123,7 @@
 				PRDT_NAME	as "prdtName",  <!-- 部件名称 -->
 				PLAN_COMPLETION_DATE	as "planCompletionDate",  <!-- 计划完成日期 -->
 				NUM	as "num",  <!-- 计划数量 -->
+		UNIT_WT	as "unitWt",  <!-- 单重 -->
 				TOTAL_WT	as "totalWt",  <!-- 计划重量 -->
 				STATUS	as "status",  <!-- 状态   0-未派工，1-已派工 -->
 				ORG_NO	as "orgNo",  <!-- 生产组编码 -->
@@ -240,6 +241,7 @@
 										PRDT_NAME,  <!-- 部件名称 -->
 										PLAN_COMPLETION_DATE,  <!-- 计划完成日期 -->
 										NUM,  <!-- 计划数量 -->
+		UNIT_WT,
 										TOTAL_WT,  <!-- 计划重量 -->
 										STATUS,  <!-- 状态   0-未派工，1-已派工 -->
 										ORG_NO,  <!-- 生产组编码 -->
@@ -269,7 +271,7 @@
 		PART_THICK  <!-- 厚 -->
 										)
 	    VALUES (#id#, #companyCode#, #projCode#, #projName#, #productionOrderNo#,#inventRecordId#, #prdtType#, #prdtCode#,
-	            #prdtName#, #planCompletionDate#, #num#, #totalWt#, #status#, #orgNo#, #orgName#, #createdBy#, #createdTime#,
+	            #prdtName#, #planCompletionDate#, #num#,#unitWt#, #totalWt#, #status#, #orgNo#, #orgName#, #createdBy#, #createdTime#,
 	            #updatedBy#, #updatedTime#, #depCode#, #remark#, #filePath1#, #filePath2#, #filePath3#, #filePath4#, #filePath5#,
 		#prdtSpec#,#partType#,#partCode#,#partName#,#partSpec#,#remark1#,
 		#prdtLength#,#prdtWidth#,#prdtThick#,#partLength#,#partWidth#,#partThick#)
@@ -292,6 +294,7 @@
 					PRDT_NAME	= #prdtName#,   <!-- 部件名称 -->
 					PLAN_COMPLETION_DATE	= #planCompletionDate#,   <!-- 计划完成日期 -->
 					NUM	= #num#,   <!-- 计划数量 -->
+		UNIT_WT	= #unitWt#,   <!-- 单重 -->
 					TOTAL_WT	= #totalWt#,   <!-- 计划重量 -->
 					STATUS	= #status#,   <!-- 状态   0-未派工，1-已派工 -->
 					ORG_NO	= #orgNo#,   <!-- 生产组编码 -->

src/main/java/com/baosight/hpjx/util/CommonMethod.java

@@ -31,7 +31,7 @@ public class CommonMethod {
      * @param selectParams 筛选条件
      * 公用下拉方法
      */
-    public static void initBlock(EiInfo inInfo, List<DdynamicEnum> tableParams, Map<String, String> selectParams){
+    public static void initBlock(EiInfo inInfo, List<DdynamicEnum> tableParams, Map<String, Object> selectParams){
         initBlock(inInfo, tableParams, selectParams,true);
     }
 
@@ -41,7 +41,7 @@ public class CommonMethod {
      * @param selectParams 筛选条件
      * 公用下拉方法
      */
-    public static void initBlock(EiInfo inInfo, List<DdynamicEnum> tableParams, Map<String, String> selectParams, Boolean isSplicingSymbol){
+    public static void initBlock(EiInfo inInfo, List<DdynamicEnum> tableParams, Map<String, Object> selectParams, Boolean isSplicingSymbol){
         /* 新建一个块 将每个表查询到的结果放入单独的块中 */
         EiBlock eiBlock;
 	    /* 行数据 将每个数据源查询到的数据放到每个模块的行数据中 */

src/main/java/com/baosight/hpjx/util/HttpUtils.java

@@ -6,11 +6,11 @@ import java.io.IOException;
 import java.util.Map;
 
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.Headers;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
+//import okhttp3.Headers;
+//import okhttp3.MediaType;
+//import okhttp3.OkHttpClient;
+//import okhttp3.Request;
+//import okhttp3.RequestBody;
 
 /**
  * httpclient
@@ -20,94 +20,94 @@ import okhttp3.RequestBody;
  */
 @Slf4j
 public class HttpUtils {
-	
-	public static final MediaType JSON_MEDIA_TYPE = MediaType.get("application/json; charset=utf-8");
-	public static final MediaType FORM_MEDIA_TYPE = MediaType.get("application/x-www-form-urlencoded");
-	
-	/**
-	 * GET请求
-	 *
-	 * @param url
-	 * @return
-	 * @throws IOException
-	 */
-	public static String get(String url) throws IOException {
-		return get(url, null);
-	}
-	
-	/**
-	 * GET请求
-	 *
-	 * @param url
-	 * @param header
-	 * @return
-	 * @throws IOException
-	 */
-	public static String get(String url, Map<String, String> header) throws IOException {
-		return request(RequestMethod.GET, url, header, null, JSON_MEDIA_TYPE);
-	}
-	
-	/**
-	 * POST请求
-	 *
-	 * @param url
-	 * @return
-	 * @throws IOException
-	 */
-	public static String post(String url) throws IOException {
-		return post(url, null, JSON_MEDIA_TYPE);
-	}
-	
-	/**
-	 * POST请求
-	 *
-	 * @param url
-	 * @param param
-	 * @return
-	 * @throws IOException
-	 */
-	public static String post(String url, String param, MediaType mediaType) throws IOException {
-		return post(url, null, param, mediaType);
-	}
-	
-	/**
-	 * http请求(post)
-	 *
-	 * @param url
-	 * @param header
-	 * @param param
-	 * @return
-	 */
-	public static String post(String url, Map<String, String> header, String param, MediaType mediaType)
-			throws IOException {
-		return request(RequestMethod.POST, url, header, param, mediaType);
-	}
-	
-	/**
-	 * 发送请求
-	 *
-	 * @param requestMethod 请求类型POST OR GET
-	 * @param url
-	 * @param header
-	 * @param param
-	 * @return
-	 */
-	private static String request(RequestMethod requestMethod, String url, Map<String, String> header, String param,
-			MediaType mediaType) throws IOException {
-		log.info("请求开始：{},{},{}", url, header, StringUtils.subStr(param, 500));
-		OkHttpClient okHttpClient = new OkHttpClient();
-		Request.Builder builder = new Request.Builder().url(url);
-		if (RequestMethod.POST.equals(requestMethod)) {
-			builder = builder.post(RequestBody.create(StringUtils.isBlank(param) ? "" : param, mediaType));
-		} else {
-			builder = builder.get();
-		}
-		if (MapUtils.isNotEmpty(header)) {
-			builder = builder.headers(Headers.of(header));
-		}
-		String result = okHttpClient.newCall(builder.build()).execute().body().string();
-		log.info("请求结束：{}", StringUtils.subStr(result, 500));
-		return result;
-	}
-	
+//
+//	public static final MediaType JSON_MEDIA_TYPE = MediaType.get("application/json; charset=utf-8");
+//	public static final MediaType FORM_MEDIA_TYPE = MediaType.get("application/x-www-form-urlencoded");
+//
+//	/**
+//	 * GET请求
+//	 *
+//	 * @param url
+//	 * @return
+//	 * @throws IOException
+//	 */
+//	public static String get(String url) throws IOException {
+//		return get(url, null);
+//	}
+//
+//	/**
+//	 * GET请求
+//	 *
+//	 * @param url
+//	 * @param header
+//	 * @return
+//	 * @throws IOException
+//	 */
+//	public static String get(String url, Map<String, String> header) throws IOException {
+//		return request(RequestMethod.GET, url, header, null, JSON_MEDIA_TYPE);
+//	}
+//
+//	/**
+//	 * POST请求
+//	 *
+//	 * @param url
+//	 * @return
+//	 * @throws IOException
+//	 */
+//	public static String post(String url) throws IOException {
+//		return post(url, null, JSON_MEDIA_TYPE);
+//	}
+//
+//	/**
+//	 * POST请求
+//	 *
+//	 * @param url
+//	 * @param param
+//	 * @return
+//	 * @throws IOException
+//	 */
+//	public static String post(String url, String param, MediaType mediaType) throws IOException {
+//		return post(url, null, param, mediaType);
+//	}
+//
+//	/**
+//	 * http请求(post)
+//	 *
+//	 * @param url
+//	 * @param header
+//	 * @param param
+//	 * @return
+//	 */
+//	public static String post(String url, Map<String, String> header, String param, MediaType mediaType)
+//			throws IOException {
+//		return request(RequestMethod.POST, url, header, param, mediaType);
+//	}
+//
+//	/**
+//	 * 发送请求
+//	 *
+//	 * @param requestMethod 请求类型POST OR GET
+//	 * @param url
+//	 * @param header
+//	 * @param param
+//	 * @return
+//	 */
+//	private static String request(RequestMethod requestMethod, String url, Map<String, String> header, String param,
+//			MediaType mediaType) throws IOException {
+//		log.info("请求开始：{},{},{}", url, header, StringUtils.subStr(param, 500));
+//		OkHttpClient okHttpClient = new OkHttpClient();
+//		Request.Builder builder = new Request.Builder().url(url);
+//		if (RequestMethod.POST.equals(requestMethod)) {
+//			builder = builder.post(RequestBody.create(StringUtils.isBlank(param) ? "" : param, mediaType));
+//		} else {
+//			builder = builder.get();
+//		}
+//		if (MapUtils.isNotEmpty(header)) {
+//			builder = builder.headers(Headers.of(header));
+//		}
+//		String result = okHttpClient.newCall(builder.build()).execute().body().string();
+//		log.info("请求结束：{}", StringUtils.subStr(result, 500));
+//		return result;
+//	}
+//
 }

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

@@ -58,7 +58,7 @@
 			</EF:EFComboColumn>
 			<EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" align="center"/>
 			<EF:EFColumn enable="false" ename="prdtName" cname="部件名称" align="center"/>
-			<EF:EFColumn enable="false" ename="prdtSpec" cname="部件规格" align="center"/>
+			<EF:EFColumn hidden="true" enable="false" ename="prdtSpec" cname="部件规格" align="center"/>
 			<EF:EFColumn hidden="true" enable="false" ename="prdtLength" cname="部件-长"/>
 			<EF:EFColumn hidden="true" enable="false" ename="prdtWidth" cname="部件-宽"/>
 			<EF:EFColumn hidden="true" enable="false" ename="prdtThick" cname="部件-厚"/>

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

+var inventNameGlobalData = [];
+$(function() {
+    // 查询
+    $("#QUERY").on("click", query);
+
+    IPLATUI.EFGrid = {
+        "result": {
+            columns: [{
+                field: "inventCode",
+                template: function (dataItem) {
+                    for (let i = 0; i < inventNameGlobalData.length; i++) {
+                        if (inventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
+                            return inventNameGlobalData[i]['textField'];
+                        }
+                    }
+                    return "";
+                }
+            }]
+        },
+    };
+});
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+    // 存货名称
+    let eiInfo = new EiInfo();
+    EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+        onSuccess: function (ei) {
+            inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
+        },
+        onFail: function (ei) {
+        }
+    }, {async: false});
+	// 查询
+	query();
+});
+
+/**
+ * 查询
+ */
+let query = function () {
+	resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
+}
+

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage title="产品库存管理">
+	<EF:EFRegion id="inqu" title="查询条件">
+		<div class="row">
+			<EF:EFInput blockId="inqu_status" ename="projCode" colWidth="3" cname="项目编号:" />
+			<EF:EFInput blockId="inqu_status" ename="projName" colWidth="3" cname="项目名称:" />
+			<EF:EFInput blockId="inqu_status" ename="prodNo" colWidth="3" cname="生产单号:" />
+			<EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+		</div>
+		<div class="row">
+			<EF:EFSelect ename="inqu_status-0-inventCode" cname="部件名称" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect ename="inqu_status-0-subInventCode" cname="零部件名称" colWidth="3" filter="contains" defultValue="">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+		</div>
+    </EF:EFRegion>
+
+    <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="prodNo" cname="生产单号" width="120" align="center" required="true"/>
+			<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
+		                      itemTemplate="#=textField#" blockName="wh_record_block_id"
+		                      textField="textField" valueField="valueField"
+		                      align="center" filter="contains">
+		    </EF:EFComboColumn>
+			<EF:EFColumn ename="projCode" cname="项目编号" width="120" align="center" required="true"/>
+			<EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" required="true"/>
+			<EF:EFColumn ename="inventCode" cname="部件名称" width="120" align="center" required="true"/>
+			<EF:EFColumn ename="subInventCode" cname="零部件名称" width="120" align="center" required="true"/>
+			<EF:EFColumn ename="length" cname="长" format="{0:N3}" maxLength="20" width="90" align="right"/>
+			<EF:EFColumn ename="width" cname="宽" format="{0:N3}" maxLength="20" width="90" align="right"/>
+			<EF:EFColumn ename="thich" cname="厚" format="{0:N3}" maxLength="20" width="90" align="right"/>
+		    <EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="90" align="right"/>
+			<EF:EFColumn ename="unitWeight" 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="120" align="center"/>
+			<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
+		    <EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
+		                 editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
+			<EF:EFColumn ename="updatedBy" cname="更新人" enable="false" width="100" align="center"/>
+			<EF:EFColumn ename="updatedTime" cname="更新时刻" enable="false" width="140" align="center"
+						 editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
+	    </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>

src/main/webapp/HP/SC/HPSC003.jsp

@@ -46,7 +46,7 @@
             </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" readonly="true"/>
             <EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true"/>
-            <EF:EFColumn enable="false" ename="spec"  cname="规格" readonly="true"/>
+            <EF:EFColumn hidden="true" enable="false" ename="spec"  cname="规格" readonly="true"/>
             <EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
             <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy/MM/dd" width="150"
                          required='true' readonly="true"/>
@@ -71,10 +71,10 @@
             <EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="零件名称"/>
             <EF:EFColumn enable="false" ename="spec"  cname="规格" readonly="true"/>
             <EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
-            <EF:EFComboColumn enable="false" ename="delStatus" cname="状态">
-                <EF:EFOption label="已删除" value="0"/>
-                <EF:EFOption label="启用" value="1"/>
-            </EF:EFComboColumn>
+<%--            <EF:EFComboColumn enable="false" ename="delStatus" cname="状态">--%>
+<%--                <EF:EFOption label="已删除" value="0"/>--%>
+<%--                <EF:EFOption label="启用" value="1"/>--%>
+<%--            </EF:EFComboColumn>--%>
             <EF:EFColumn enable="false" ename="num" readonly="true" cname="计划数量"/>
             <EF:EFColumn enable="false" ename="unitWt" readonly="true" cname="计划重量"/>
             <EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"/>

src/main/webapp/HP/SC/HPSC098.js

@@ -27,7 +27,7 @@ $(function () {
             parent.JSColorbox.setValueCallback(row.orgId);
             return;
         };
-        JSUtils.confirm("确定\"是否\"分派? ", {
+        JSUtils.confirm("确定分派? ", {
             ok: function () {
                 parent.JSColorbox.setValueCallback(row.orgId);
             }