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

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

@@ -46,7 +46,7 @@ public class ServiceHPKC003 extends ServiceBase {
 	 */
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), new HashMap<String,Object>(){{put("inventTypes",new String[]{"2","3"});}}, false);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC003().eiMetadata);
 		} catch (Exception e) {

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

@@ -53,7 +53,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			Map queryMap = new HashMap();
-			queryMap.put("inventTypes", DEFAULT_INVENT_TYPE);
+			queryMap.put("inventTypes", new String[]{"2","3"});
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC005B().eiMetadata);
 		} catch (Exception e) {

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

@@ -12,6 +12,7 @@ import com.baosight.hpjx.hp.sc.domain.HPSC001;
 import com.baosight.hpjx.hp.sc.domain.HPSC002;
 import com.baosight.hpjx.hp.sc.tools.HPSCTools;
 import com.baosight.hpjx.util.CommonMethod;
+import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -40,6 +41,7 @@ public class ServiceHPSC002 extends ServiceBase {
     public EiInfo initLoad(EiInfo inInfo) {
         try {
             Map<String, Object> map = new HashMap<>();
+            map.put("itemCode","ITEM_CODE in ('2','3','4')");
             CommonMethod.initBlock(inInfo,
                     Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID,DdynamicEnum.CODESET_CODE_BLOCK_ID),map,
                     false);
@@ -357,7 +359,7 @@ public class ServiceHPSC002 extends ServiceBase {
 
     /**
      * 生产生产计划
-     * @param id
+     * @param id 生产ID
      */
     public void autoPlanInfo(String id) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -430,4 +432,29 @@ public class ServiceHPSC002 extends ServiceBase {
             DaoUtils.insert("HPSC004.insert", HPSC004.toMap());
         }
     }
+
+
+    /**
+     * 部件类型下拉框
+     * @param inInfo 形参
+     * @return 返回集合
+     */
+    public EiInfo queryPrdtTypeBox(EiInfo inInfo) {
+        try {
+            List<DdynamicEnum> list = new ArrayList<>();
+            Map map = new HashMap();
+            if (inInfo.getCellStr(EiConstant.queryBlock,0,"itemCode").equals("1")){
+                map.put("itemCode","ITEM_CODE in ('4')");
+            }else if (inInfo.getCellStr(EiConstant.queryBlock,0,"itemCode").equals("2")) {
+                map.put("itemCode","ITEM_CODE in ('2','3')");
+            }else {
+                map.put("itemCode","ITEM_CODE in ('2','3','4')");
+            }
+            list.add(DdynamicEnum.CODESET_CODE_BLOCK_ID);
+            CommonMethod.initBlock(inInfo, list, map, false);
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询部件类型失败");
+        }
+        return inInfo;
+    }
 }

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

@@ -498,10 +498,16 @@
 	<select id="querySmallCode" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
 		select distinct
 			ITEM_CODE as "itemCode",
-			ITEM_CNAME as "itemCname"
+			ITEM_CNAME as "itemCname",
+			case when ITEM_CODE in ('2','3') then '3'
+				when ITEM_CODE in ('4') then '4'
+		else '0' end "param1Field"
 		from
 			iplat.tedcm01
-		where STATUS = '1' and CODESET_CODE = 'hpjx.hpkc.inventType' and ITEM_CODE IN ('2','3','4')
+		where STATUS = '1' and CODESET_CODE = 'hpjx.hpkc.inventType'
+		<isNotEmpty prepend=" AND " property="itemCode">
+			$itemCode$
+		</isNotEmpty>
 	</select>
 
 </sqlMap>
\ No newline at end of file

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

@@ -43,7 +43,7 @@
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
-			<EF:EFComboColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>

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

@@ -51,7 +51,7 @@
 			<EF:EFComboColumn ename="inventType" cname="存货类型" enable="false" width="100" align="center">
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
-			<EF:EFComboColumn ename="whCode" cname="仓库编码" enable="false" width="120" align="center"
+			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"
 			                  columnTemplate="#=textField#" itemTemplate="#=textField#">
 			</EF:EFComboColumn>

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

@@ -49,9 +49,9 @@
 			<EF:EFColumn ename="applyWeight" cname="申请重量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="applyRemark" cname="说明" enable="false" width="150" editType="textarea" copy="true"/>
 			<EF:EFColumn ename="amount" cname="库存数量" enable="false" width="120" align="right" format="{0:N3}"
-			             sumType="all"/>
+			             />
 			<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>

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

@@ -234,6 +234,23 @@ $(function () {
                         }
                         return template;
                     }
+                }, {
+                    field: "prdtType",
+                    title: "部件类型",
+                    filter: function (options) {
+                        let selectTreeNode = IPLATUI.EFTree.materialTree.selectTreeNode;
+                        if(selectTreeNode.lv == 1) {
+                            // 返回我们过滤后的数据集
+                            /*return options.values[0][province];*/
+                            return _.filter(options.values, function (item) {
+                                return item["valueField"]==4;
+                            })
+                        } else {
+                            return _.filter(options.values, function (item) {
+                                return item["valueField"]==2 || item["valueField"]==3;
+                            })
+                        }
+                    }
                 },{
                     field: "prdtName",
                     title: "部件名称",
@@ -265,7 +282,7 @@ $(function () {
                         if (selectTreeNode.lv == 1){
                             eiInfo.set("inventType", 4);
                         }else if (selectTreeNode.lv == 2){
-                            eiInfo.set("inventType", 3);
+                            eiInfo.set("inventTypes", [2,3]);
                         }else {
                             eiInfo.set("inventTypes", [3,4]);
                         }

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

@@ -15,7 +15,7 @@
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
             </EF:EFSelect>--%>
-            <EF:EFSelect cname="部件名称" ename="inqu_status-0-prdtCode" filter="contains" defultValue="">
+            <EF:EFSelect cname="部件名称" ename="inqu_status-0-prdtCode" colWidth="3" filter="contains" defultValue="">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>