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

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

+package com.baosight.hpjx.hp.kc.service;
+
+import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.common.InventTypeEnum;
+import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.hp.constant.HPConstant;
+import com.baosight.hpjx.hp.kc.domain.HPKC002;
+import com.baosight.hpjx.hp.kc.domain.HPKC010;
+import com.baosight.hpjx.hp.kc.tools.HPKCTools;
+import com.baosight.hpjx.hp.sc.domain.HPSC006;
+import com.baosight.hpjx.hp.sc.tools.HPSCTools;
+import com.baosight.hpjx.util.*;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+import com.baosight.iplat4j.core.util.NumberUtils;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 生产领料挑选库存
+ *
+ * @author:songx
+ * @date:2022/7/11,11:08
+ */
+public class ServiceHPKC002B extends ServiceEPBase {
+	
+	// 指定存货类型
+	private static final Integer[] DEFAULT_INVENT_CODE = {InventTypeEnum.RAW.getCode(),
+			InventTypeEnum.CONSUMABLE.getCode()};
+	
+	/**
+	 * 初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "库存查询", operType = "查询", operDesc = "生产领料单-库存查询-初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			Map queryMap = new HashMap();
+			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.INVENT_SPEC_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), queryMap, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
+			String hpsc006Id = inInfo.getString("inqu_status-0-hpsc006Id");
+			if (StringUtils.isNotBlank(hpsc006Id)) {
+				inInfo.set("inqu_result-0-hpsc006Id", hpsc006Id);
+			}
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC010().eiMetadata);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 查询数据列表
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	@OperationLogAnnotation(operModul = "库存查询", operType = "查询", operDesc = "生产领料单-库存查询-查询")
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			queryRow.put("inventTypes", DEFAULT_INVENT_CODE);
+			inInfo = super.query(inInfo, HPKC010.QUERY, new HPKC010());
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 生成出库单
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生产领料单-库存查询-生成出库单")
+	public EiInfo select(EiInfo inInfo) {
+		try {
+			String hpsc006Id = inInfo.getString("inqu_result-0-hpsc006Id");
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			// 库存ID
+			List<Long> ids = ObjectUtils.listKey(resultRows, "id");
+			// 行锁
+			HPKCTools.HpKc010.lock(ids);
+			// 获取库存信息
+			Map<Long, HPKC010> dbKc010Map = HPKCTools.HpKc010.map(ids);
+			// 状态校验
+			this.checkData(resultRows, dbKc010Map);
+			// 生成销售库单
+			this.saveData(resultRows, dbKc010Map, hpsc006Id);
+		} catch (Exception e) {
+			LogUtils.setMsg(inInfo, e, "生成领料单失败");
+		}
+		return inInfo;
+	}
+	
+	/**
+	 * 数据校验
+	 *
+	 * @param resultRows
+	 * @param dbKc010Map
+	 */
+	private void checkData(List<Map> resultRows, Map<Long, HPKC010> dbKc010Map) {
+		for (Map row : resultRows) {
+			Long id = MapUtils.getLong(row, "id");
+			HPKC010 dbKc010 = dbKc010Map.get(id);
+			AssertUtils.isNull(dbKc010, "库存号[" + id + "]不存在!");
+			// 校验数量
+			BigDecimal applyAmount = MapUtils.getBigDecimal(row, "applyAmount");
+			AssertUtils.isGt(applyAmount, dbKc010.getAmount(),
+					"库存号[" + id + "]可用数量不足！");
+		}
+	}
+	
+	/**
+	 * 保存数据
+	 *
+	 * @param resultRows
+	 * @param dbKc010Map
+	 */
+	private void saveData(List<Map> resultRows, Map<Long, HPKC010> dbKc010Map, String hpsc006Id) {
+		for (Map row : resultRows) {
+			BigDecimal applyAmount = MapUtils.getBigDecimal(row, "applyAmount");
+			String applyRemark = MapUtils.getString(row, "applyRemark");
+			String projCode = MapUtils.getString(row, "projCode");
+			Long kcId = MapUtils.getLong(row, "id");
+			HPKC010 dbKc010 = dbKc010Map.get(kcId);
+			HPKC002 newKc002 = BeanUtils.copy(dbKc010, HPKC002.class);
+			newKc002.setReqNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC002_NUMBER));
+			newKc002.setReceiptDate(DateUtils.shortDate());
+			newKc002.setAmount(applyAmount);
+			newKc002.setWeight(dbKc010.getUnitWeight().multiply(applyAmount));
+			newKc002.setRemark(applyRemark);
+			newKc002.setKcId(kcId);
+			newKc002.setDeleteFlag(CommonConstant.YesNo.NO_0);
+			if (StringUtils.isNotBlank(hpsc006Id)) {
+				HPSC006 HPSC006 = HPSCTools.Hpsc006.getById(NumberUtils.toLong(hpsc006Id));
+				newKc002.setHpsc006Id(HPSC006.getId());
+				newKc002.setProjCode(HPSC006.getProjCode());
+			}else{
+				newKc002.setProjCode(projCode);
+			}
+			DaoUtils.insert(HPKC002.INSERT, newKc002);
+			// 修改库存数量
+			HPKCTools.updateStock(newKc002.getWhCode(), newKc002.getInventRecordId(),
+					newKc002.getAmount().negate(), dbKc010.getUnitWeight(), newKc002.getWeight().negate());
+		}
+	}
+}

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

@@ -417,9 +417,6 @@ public class HPPZTools {
 				}
 				sb.append(thick.stripTrailingZeros().toPlainString());
 			}
-			if (StringUtils.isNotBlank(sb)) {
-				sb.append("(MM)");
-			}
 			return sb.toString();
 		}
 		

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

+package com.baosight.hpjx.hp.sc.domain;
+
+import com.baosight.iplat4j.core.data.DaoEPBase;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.util.NumberUtils;
+import com.baosight.iplat4j.core.util.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class HPSC098 extends DaoEPBase {
+
+    private String factoryCode = " ";		/* 厂区编码*/
+    private String factoryName = " ";		/* 厂区名称*/
+    private String groupCode = " ";		/* 组织编码*/
+    private String groupName = " ";		/* 组织名称 */
+    /**
+     * initialize the metadata
+     */
+    public void initMetaData() {
+        EiColumn eiColumn;
+        eiColumn = new EiColumn("factoryCode");
+        eiColumn.setDescName("厂区编码");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn("factoryName");
+        eiColumn.setDescName("厂区名称");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn("groupCode");
+        eiColumn.setDescName("组织编码");
+        eiMetadata.addMeta(eiColumn);
+
+        eiColumn = new EiColumn("groupName");
+        eiColumn.setDescName("组织名称");
+        eiMetadata.addMeta(eiColumn);
+
+
+    }
+    /**
+     * the constructor
+     */
+    public HPSC098() {
+        initMetaData();
+    }
+
+    public String getFactoryCode() {
+        return factoryCode;
+    }
+
+    public void setFactoryCode(String factoryCode) {
+        this.factoryCode = factoryCode;
+    }
+
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    public String getGroupCode() {
+        return groupCode;
+    }
+
+    public void setGroupCode(String groupCode) {
+        this.groupCode = groupCode;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    /**
+     * get the value from Map
+     */
+    public void fromMap(Map map) {
+
+        setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("factoryCode")), factoryCode));
+        setFactoryName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("factoryName")), factoryName));
+        setGroupCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("groupCode")), groupCode));
+        setGroupName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("groupName")), groupName));
+
+    }
+
+    /**
+     * set the value to Map
+     */
+    public Map toMap() {
+
+        Map map = new HashMap();
+        map.put("factoryCode",StringUtils.toString(factoryCode, eiMetadata.getMeta("factoryCode")));
+        map.put("factoryName",StringUtils.toString(factoryName, eiMetadata.getMeta("factoryName")));
+        map.put("groupCode",StringUtils.toString(groupCode, eiMetadata.getMeta("groupCode")));
+        map.put("groupName",StringUtils.toString(groupName, eiMetadata.getMeta("groupName")));
+
+        return map;
+
+    }
+}

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

@@ -288,6 +288,8 @@ public class ServiceHPSC002 extends ServiceBase {
                 if (!hppz002.getParentId().equals("root")) {
                     this.checkTreeNodeLeaf(hppz002.getParentId());
                 }
+				//处理项目管理中物料状态
+				HPSCTools.updateProjStatus(hppz002.getProjCode());
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);
             inInfo.setMsg("新增成功！");
@@ -629,28 +631,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 DaoUtils.update("HPSC002.check",map2);
 
                 //处理项目管理中物料状态
-                Map map3 = new HashMap();
-                map3.put("projCode",THPSC002.getProjCode());
-                List list1 = dao.query("HPSC002.checkExamineNum1", map3);
-                List list2 = dao.query("HPSC002.checkExamineNum1Count", map3);
-                //未提交数量
-                int num1 = NumberUtils.toint(list1.get(0));
-                //总量
-                int num2 = NumberUtils.toint(list2.get(0));
-
-                if (num1 == 0) {
-                    //都已经提交
-                    Map map4 = new HashMap();
-                    map4.put("projCode",THPSC002.getProjCode());
-                    map4.put("materialStatus",2);
-                    DaoUtils.update("HPSC001.checkByProjCode",map4);
-                } else if (num1 > 0 && num1 < num2) {
-                    // 部分提交
-                    Map map4 = new HashMap();
-                    map4.put("projCode",THPSC002.getProjCode());
-                    map4.put("materialStatus",1);
-                    DaoUtils.update("HPSC001.checkByProjCode",map4);
-                }
+                HPSCTools.updateProjStatus(hppz002.getProjCode());
 
             }
         } catch (PlatException e) {

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

@@ -100,6 +100,7 @@ public class ServiceHPSC005A extends ServiceBase {
 			for (Map resultRow : resultRows) {
 				HPSC005A fSc005a = new HPSC005A();
 				fSc005a.fromMap(resultRow);
+
 				if (fSc005a.getId() == null || fSc005a.getId() == 0) {
 					this.add(dbSc005, fSc005a);
 				} else {
@@ -217,10 +218,11 @@ public class ServiceHPSC005A extends ServiceBase {
 	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "生产订单-拆单派工A-分派")
 	public EiInfo assign(EiInfo inInfo) {
 		try {
-			List<String> orderIds = (List<String>) inInfo.get("ids");
-			Long orgId = Long.parseLong(inInfo.getString("id"));
-			// 先找到分派的组织
-			HPPZ011 dbPz011 = HPPZTools.HpPz011.get(orgId);
+			String[] orderIds = inInfo.getString("ids").split(",");
+			String factoryCode = inInfo.getString("factoryCode");
+			String factoryName = inInfo.getString("factoryName");
+			String groupCode = inInfo.getString("groupCode");
+			String groupName = inInfo.getString("groupName");
 			for (String orderId : orderIds) {
 				// 校验主订单是否已分派
 				HPSC005 dbSc005 = HPSCTools.HpSc005.getById(Long.parseLong(orderId));
@@ -244,14 +246,14 @@ public class ServiceHPSC005A extends ServiceBase {
 					newSc005a.setNum(dbSc005.getUnassignedNum());
 				}
 				newSc005a.setTotalWt(newSc005a.getNum().multiply(dbSc005.getUnitWt()));
-				newSc005a.setOrgNo(dbPz011.getGroupCode());
-				newSc005a.setOrgName(dbPz011.getGroupName());
-				newSc005a.setFactoryCode(dbPz011.getFactoryCode());
-				newSc005a.setFactoryName(dbPz011.getFactoryName());
+				newSc005a.setOrgNo(groupCode);
+				newSc005a.setOrgName(groupName);
+				newSc005a.setFactoryCode(factoryCode);
+				newSc005a.setFactoryName(factoryName);
 				DaoUtils.insert(HPSC005A.INSERT, newSc005a);
 			}
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
-			inInfo.setMsg("操作成功！本次对[" + orderIds.size() + "]条数据分派成功!");
+			inInfo.setMsg("操作成功！本次对[" + orderIds.length + "]条数据分派成功!");
 		} catch (Exception e) {
 			LogUtils.setMsg(inInfo, e, "分派失败");
 		}
@@ -265,7 +267,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 */
 	private void setBaseInfo(HPSC005A fSc005a) {
 		// 厂区名称
-		//fSc005a.setFactoryName(HPPZTools.HpPz011.getFactoryName(fSc005a.getFactoryCode()));
 		fSc005a.setFactoryName(HPXSTools.XsOrg.get(fSc005a.getFactoryCode()).getOrgCname());
 		// 生产组名称
 		fSc005a.setOrgName(HPXSTools.XsOrg.get(fSc005a.getOrgNo()).getOrgCname());

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

@@ -12,6 +12,7 @@ import com.baosight.hpjx.hp.pz.domain.HPPZ011;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.hp.sc.domain.*;
 import com.baosight.hpjx.hp.xs.domain.Org;
+import com.baosight.hpjx.hp.xs.tools.HPXSTools;
 import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
@@ -135,10 +136,8 @@ public class ServiceHPSC006 extends ServiceBase {
                 if(HPSC006.getFactoryCode()!=null && !(HPSC006.getFactoryCode().equals(" "))) {
                     AssertUtils.isEmpty(HPSC006.getOrgNo(), "已选择厂区，下料组不能为空");
                     HPSC006.setStatus(1);
-                    Org Org =(Org) dao.get("HPXSOrg.query","orgId",HPSC006.getOrgNo());
-                    Org Fac =(Org) dao.get("HPXSOrg.query","orgId",Org.getParentOrgId());
-                    HPSC006.setOrgName(Org.getOrgCname());
-                    HPSC006.setFactoryName(Fac.getOrgCname());
+                    HPSC006.setOrgName(HPXSTools.XsOrg.get(HPSC006.getFactoryCode()).getOrgCname());
+                    HPSC006.setFactoryName(HPXSTools.XsOrg.get(HPSC006.getOrgNo()).getOrgCname());
                 }
                 DaoUtils.insert("HPSC006.insert",HPSC006);
             }
@@ -182,10 +181,8 @@ public class ServiceHPSC006 extends ServiceBase {
                 HPSC006.setTotalWt(totalWt);
                 HPSC006.setPlanCompletionDate(StringUtil.removeHorizontalLine(HPSC006.getPlanCompletionDate()));
                 HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
-                Org Org =(Org) dao.get("HPXSOrg.query","orgId",HPSC006.getOrgNo());
-                Org Fac =(Org) dao.get("HPXSOrg.query","orgId",Org.getParentOrgId());
-                HPSC006.setOrgName(Org.getOrgCname());
-                HPSC006.setFactoryName(Fac.getOrgCname());
+                HPSC006.setOrgName(HPXSTools.XsOrg.get(HPSC006.getFactoryCode()).getOrgCname());
+                HPSC006.setFactoryName(HPXSTools.XsOrg.get(HPSC006.getOrgNo()).getOrgCname());
                 DaoUtils.update("HPSC006.update",HPSC006);
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);

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

@@ -3,6 +3,8 @@ package com.baosight.hpjx.hp.sc.service;
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.hp.pz.domain.HPPZ011;
+import com.baosight.hpjx.hp.sc.domain.HPSC001;
+import com.baosight.hpjx.hp.sc.domain.HPSC098;
 import com.baosight.hpjx.hp.xs.domain.Org;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
@@ -29,11 +31,13 @@ public class ServiceHPSC098 extends ServiceBase {
 	@OperationLogAnnotation(operModul = "组织机构",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			String orgType = inInfo.getString("inqu_status-0-orgType");
 			Map queryMap = new HashMap();
-			queryMap.put("orgType", "cutGroup");
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.ORG_RECORD_BLOCK_ID), queryMap);
+			queryMap.put("orgType", orgType);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID), null);
-			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ011().eiMetadata);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC098().eiMetadata);
+			inInfo.set("inqu_status-0-orgType", orgType);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
@@ -50,7 +54,7 @@ public class ServiceHPSC098 extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			inInfo = super.query(inInfo, "HPXSOrg.queryList", new HPPZ011());
+			inInfo = super.query(inInfo, "HPSC098.query", new HPSC001());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC098.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="HPSC098">
+
+	<select id="query" parameterClass="java.util.HashMap"
+			resultClass="com.baosight.hpjx.hp.sc.domain.HPSC098">
+		SELECT
+		ORG_ENAME AS "groupCode",
+		ORG_CNAME AS "groupName",
+		FACTORY_CODE AS "factoryCode",
+		FACTORY_NAME AS "factoryName"
+		FROM iplat.TXSOG01
+		WHERE 1 = 1
+		AND FACTORY_CODE IN (
+		SELECT ORG_ENAME FROM iplat.TXSOG01
+		WHERE COMPANY_CODE = #companyCode# AND ORG_TYPE = 'factory'
+		)
+		<isNotEmpty prepend=" AND " property="orgType">
+			ORG_TYPE = #orgType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="groupCode">
+			ORG_ENAME = #groupCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="factoryCode">
+			FACTORY_CODE = #factoryCode#
+		</isNotEmpty>
+	</select>
+
+	<select id="count" resultClass="int">
+		SELECT
+		COUNT(*)
+		FROM iplat.TXSOG01
+		WHERE 1 = 1
+		AND FACTORY_CODE IN (
+		SELECT ORG_ENAME FROM iplat.TXSOG01
+		WHERE COMPANY_CODE = #companyCode# AND ORG_TYPE = 'factory'
+		)
+		<isNotEmpty prepend=" AND " property="orgType">
+			ORG_TYPE = #orgType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="groupCode">
+			ORG_ENAME = #groupCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="factoryCode">
+			FACTORY_CODE = #factoryCode#
+		</isNotEmpty>
+	</select>
+
+</sqlMap>

src/main/java/com/baosight/hpjx/hp/sc/tools/HPSCTools.java

@@ -17,6 +17,7 @@ import com.baosight.hpjx.hp.sc.domain.HPSC007;
 import com.baosight.hpjx.util.AssertUtils;
 import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.StringUtils;
+import com.baosight.iplat4j.core.util.NumberUtils;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -125,6 +126,33 @@ public class HPSCTools {
 		DaoUtils.update(HPSqlConstant.HPSC004.UPDATE_COMPLETE, newSc004);
 	}
 
+	public static void updateProjStatus(String projCode) {
+		AssertUtils.isNull(projCode, String.format("项目编码[%s]不能为空", projCode));
+		Map map3 = new HashMap();
+		map3.put("projCode",projCode);
+		List list1 = DaoBase.getInstance().query("HPSC002.checkExamineNum1", map3);
+		List list2 = DaoBase.getInstance().query("HPSC002.checkExamineNum1Count", map3);
+		//未提交数量
+		int num1 = NumberUtils.toint(list1.get(0));
+		//总量
+		int num2 = NumberUtils.toint(list2.get(0));
+
+		if (num1 == 0) {
+			//都已经提交
+			Map map4 = new HashMap();
+			map4.put("projCode",projCode);
+			map4.put("materialStatus",2);
+			DaoUtils.update("HPSC001.checkByProjCode",map4);
+		} else if (num1 > 0 && num1 < num2) {
+			// 部分提交
+			Map map4 = new HashMap();
+			map4.put("projCode",projCode);
+			map4.put("materialStatus",1);
+			DaoUtils.update("HPSC001.checkByProjCode",map4);
+		}
+	}
+
+	
 	/**
 	 * HPSC001公共DAO定义
 	 *

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

@@ -176,6 +176,8 @@ public class ExcelUtils {
 						Map<?, ?> map = okBlock.getRow(i);
 						HPSC002.fromMap(map);
 						DaoUtils.insert("HPSC002.insert",HPSC002);
+						//处理项目管理中物料状态
+						HPSCTools.updateProjStatus(HPSC002.getProjCode());
 					}
 					if (!HPSC002.getParentId().equals("root")) {
 						checkTreeNodeLeaf(HPSC002.getParentId());

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

+let projNameGlobalData = [];
+$(function () {
+	IPLATUI.EFGrid = {
+		"result": {
+			columns: [],
+			dataBound: function () {
+			}
+		}
+	};
+
+	$("#ef_form_head").hide();
+
+	// 查询
+	$("#QUERY").on("click", query);
+
+	// 选择
+	$("#BTN_SELECT").on("click", select);
+
+});
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+	// 初始化查询
+	query();
+});
+
+/**
+ * 查询
+ */
+var query = function (e) {
+	resultGrid.dataSource.page(1);
+};
+
+/**
+ * 选择库存
+ */
+let select = function () {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据")
+		return;
+	}
+	for (let i = 0; i < rows.length; i++) {
+		let applyAmount = rows[i]['applyAmount'];
+		let amount = rows[i]['amount'];
+		if (!isPositiveInteger(applyAmount)) {
+			message("勾选的第" + (i + 1) + "行数量必须是大于0的整数");
+			return;
+		}
+		if (parseFloat(applyAmount) > parseFloat(amount)) {
+			message("第" + (i + 1) + "行申请数量不能大于库存数量");
+			return;
+		}
+	}
+	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据生成出库单吗? ", {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HPKC002B", "select",
+				true, function (e) {
+					var status = e.getStatus();
+					if (status !== -1) {
+						parent.JSColorbox.setValueCallback();
+					}
+				}
+			);
+		}
+	});
+}
+

src/main/webapp/HP/KC/HPKC002B.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="查询区域" type="query">
+		<div class="row">
+			<EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('1', '2')"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+		</div>
+	</EF:EFRegion>
+
+	<EF:EFRegion id="result" title="记录集">
+		<EF:EFInput ename="inqu_result-0-hpsc006Id" type="hidden"/>
+		<EF:EFGrid blockId="result" autoDraw="override" autoFit="true" checkMode="row">
+			<EF:EFColumn ename="id" cname="库存ID" enable="false" width="60" align="center"/>
+			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="10" align="center">
+				<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="100" align="center"
+			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="inventCode" cname="存货名称" enable="false" width="100" align="center"
+			                  blockName="invent_name_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFComboColumn ename="inventRecordId" cname="规格" enable="false" width="100" align="center"
+			                  blockName="invent_spec_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
+			</EF:EFComboColumn>
+			<EF:EFColumn ename="applyAmount" cname="申请数量" width="120" align="right" format="{0:N0}" required="true"/>
+			<EF:EFColumn ename="applyRemark" cname="申请说明" width="150" editType="textarea" copy="true"/>
+			<EF:EFColumn ename="amount" cname="库存数量" enable="false" width="120" align="right" format="{0:N0}"
+			             sumType="all"/>
+			<EF:EFColumn ename="unitWeight" cname="单量" enable="false" width="120" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="weight" cname="库存重量" enable="false" width="120" align="right" format="{0:N3}"
+			             sumType="all"/>
+			<EF:EFColumn ename="remark" cname="备注" enable="false" width="150"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+</EF:EFPage>

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

@@ -491,14 +491,6 @@ $(window).load(function () {
  */
 let query = function () {
     resultGrid.dataSource.page(1);
-    //更新树
-    var tree = $("#materialTree").data("kendoTreeView");
-    var inInfo = new EiInfo();
-    EiCommunicator.send("HPSC002", "queryTreeNode", inInfo, {//传入参数
-        onSuccess: function (inInfo) {
-            tree.reload("root");//更新树
-        }
-    });
 }
 function openUploadFile(id) {
     uploadFileWindow.open().center();

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

@@ -105,25 +105,30 @@ function tearAssignCallback() {
  * 批量分派
  */
 function assign() {
+	//重置全局变量
+	ids = [];
 	let rows = resultGrid.getCheckedRows()
 	if (rows.length < 1) {
 		message("请至少选择一条需要分派的数据");
 		return;
 	}
+	rows.forEach(function (element) {
+		ids.push(element.id)
+	});
 	// groupType=1：仅查询生产组
 	JSColorbox.open({
-		href: "HPSC098?methodName=initLoad&inqu_status-0-groupType=1",
+		href: "HPSC098?methodName=initLoad&inqu_status-0-orgType=prodGroup",
 		title: "<div style='text-align: center;'>选择组织</div>",
 		width: "70%",
 		height: "70%",
-		callbackName: function (id) {
-			let saleIds = [];
-			for (let i = 0; i < rows.length; i++) {
-				saleIds.push(rows[i]['id']);
-			}
+		callbackName: function (row) {
+
 			var info = new EiInfo()
-			info.set("ids", saleIds);
-			info.set("id", id);
+			info.set("ids",ids.join(','));
+			info.set("factoryCode",row.factoryCode);
+			info.set("factoryName",row.factoryName);
+			info.set("groupCode",row.groupCode);
+			info.set("groupName",row.groupName);
 			EiCommunicator.send("HPSC005A", "assign", info, {
 				onSuccess: function (ei) {
 					if (ei["status"] == -1) {

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

@@ -43,7 +43,7 @@ $(function () {
             JSColorbox.open({
                 href: "HPSC098?methodName=initLoad&inqu_status-0-orgType=cutGroup",
                 title: "<div style='text-align: center;'>选择组织</div>",
-                width: "40%",
+                width: "70%",
                 height: "70%",
                 callbackName: assignCallback
             });
@@ -285,7 +285,8 @@ $(function () {
                             NotificationUtil({msg: ei.msg, detailMsg: ei.detailMsg}, "error");
                         } else {
                             NotificationUtil(ei.msg);
-                            query();
+                            detailGrid.setEiInfo(ei);
+                            resultGrid.dataSource.page(resultGrid.dataSource._page);
                         }
                     },
                     onFail: function (ei) {
@@ -363,7 +364,7 @@ checkInCallback = function () {
 }
 let selectStock = function (id) {
     JSColorbox.open({
-        href: "HPKC002A?methodName=initLoad&inqu_status-0-hpsc006Id=" + id,
+        href: "HPKC002B?methodName=initLoad&inqu_status-0-hpsc006Id=" + id,
         title: "<div style='text-align: center;'>库存查询</div>",
         width: "90%",
         height: "80%",

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

@@ -79,12 +79,12 @@
                          data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
             <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" maxLength="12" displayType="0.000" cname="总重"/>
 
-            <EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue="" required="true"
+            <EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue=""
                               filter="contains" readonly="true">
                 <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" align="center" hidden="true"/>
-            <EF:EFColumn ename="orgNo" cname="下料组" width="110" align="center" required="true" readonly="true"/>
+            <EF:EFColumn ename="orgNo" cname="下料组" width="110" align="center" readonly="true"/>
             <EF:EFColumn ename="orgName" cname="生产组名称" enable="false" align="center" hidden="true"/>
 
 <%--            <EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center"--%>

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

@@ -32,6 +32,30 @@ $(function () {
             }
         });
     });
+
+    $('input[name="inqu_status-0-factoryCode"]').change(function () {
+        var inInfo=new EiInfo();
+        var factoryCode=$("#inqu_status-0-factoryCode").val();
+        var orgType = $('#inqu_status-0-orgType').val();
+        inInfo.set("inqu_status-0-parentOrgId",factoryCode);
+        inInfo.set("inqu_status-0-orgType",orgType);
+
+        EiCommunicator.send("HPXSOrg", "queryGroupComboBox", inInfo, {
+            onSuccess: function (ei) {
+                var input=$("#inqu_status-0-groupCode");
+                dataEdition=ei.getBlock("group_record_block_id").getMappedRows();
+                input.kendoDropDownList({
+                    valuePrimitive: true,
+                    dataTextField: "textField",
+                    dataValueField: "valueField",
+                    optionLabel:"请选择",
+                    dataSource: dataEdition,
+                    template: "#=textField#"
+                });
+            }, onFail: function (ei) {
+            }
+        }, {async: false});
+    });
 });
 $(window).load(function () {
     // 查询

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

@@ -9,8 +9,19 @@
 	<EF:EFRegion id="inqu" title="查询条件">
 		<EF:EFInput cname="组类型" ename="orgType" blockId="inqu_status" row="0" type="hidden"/>
 		<div class="row">
-			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFInput cname="下料组名称" ename="groupName" blockId="inqu_status" row="0" colWidth="3"/>
+<%--			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>--%>
+<%--			<EF:EFInput cname="组织名称" ename="groupName" blockId="inqu_status" row="0" colWidth="3"/>--%>
+
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区名称" colWidth="3" filter="contains"
+						 template="#=textField#" valueTemplate="#=textField#">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect ename="inqu_status-0-groupCode" cname="组织名称" filter="contains" required="false" colWidth="3"
+						 template="#=textField#" valueTemplate="#=valueField#" defaultValue="请选择">
+				<EF:EFOption label="请选择" value=""/>
+				<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 
@@ -18,8 +29,8 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="single,row">
 			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="groupCode" cname="下料组生编码" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="groupName" cname="下料组名称" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="groupCode" cname="组织编码" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="groupName" cname="组织名称" enable="false" width="120" align="center"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
 </EF:EFPage>