2024/03/20 生产入库单添加厂区

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC003.java

@@ -59,6 +59,7 @@ public class HPKC003 extends DaoEPBase {
 	public static final String FIELD_PART_THICK = "partThick";    		/* 零件-厚*/
 	public static final String FIELD_PART_SPEC = "partSpec";    		/* 零件规格*/
 	public static final String FIELD_REMARK1 = "remark1";    		/* 备注*/
+	public static final String FIELD_FACTORY_CODE = "factoryCode";            /* 厂区编码*/
 	
 	public static final String COL_ID = "ID";    		/* ID*/
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
@@ -97,6 +98,7 @@ public class HPKC003 extends DaoEPBase {
 	public static final String COL_PART_THICK = "PART_THICK";    		/* 零件-厚*/
 	public static final String COL_PART_SPEC = "PART_SPEC";    		/* 零件规格*/
 	public static final String COL_REMARK1 = "REMARK1";    		/* 备注*/
+	public static final String COL_FACTORY_CODE = "FACTORY_CODE";            /* 厂区编码*/
 	
 	public static final String QUERY = "HPKC003.query";
 	public static final String COUNT = "HPKC003.count";
@@ -141,6 +143,7 @@ public class HPKC003 extends DaoEPBase {
 	private BigDecimal partThick = new BigDecimal("0");		/* 零件-厚*/
 	private String partSpec = " ";		/* 零件规格*/
 	private String remark1 = " ";		/* 备注*/
+	private String factoryCode = " ";        /* 厂区编码*/
 	
 	/**
 	 * initialize the metadata.
@@ -321,6 +324,10 @@ public class HPKC003 extends DaoEPBase {
 		eiColumn.setDescName("备注");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_FACTORY_CODE);
+		eiColumn.setDescName("厂区编码");
+		eiMetadata.addMeta(eiColumn);
+		
 		
 	}
 	
@@ -923,6 +930,15 @@ public class HPKC003 extends DaoEPBase {
 	public void setRemark1(String remark1) {
 		this.remark1 = remark1;
 	}
+
+	public String getFactoryCode() {
+		return factoryCode;
+	}
+
+	public void setFactoryCode(String factoryCode) {
+		this.factoryCode = factoryCode;
+	}
+
 	/**
 	 * get the value from Map.
 	 *
@@ -968,6 +984,7 @@ public class HPKC003 extends DaoEPBase {
 		setPartThick(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_PART_THICK)), partThick));
 		setPartSpec(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PART_SPEC)), partSpec));
 		setRemark1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK1)), remark1));
+		setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
 	}
 	
 	/**
@@ -1014,6 +1031,7 @@ public class HPKC003 extends DaoEPBase {
 		map.put(FIELD_PART_THICK, StringUtils.toString(partThick, eiMetadata.getMeta(FIELD_PART_THICK)));
 		map.put(FIELD_PART_SPEC, StringUtils.toString(partSpec, eiMetadata.getMeta(FIELD_PART_SPEC)));
 		map.put(FIELD_REMARK1, StringUtils.toString(remark1, eiMetadata.getMeta(FIELD_REMARK1)));
+		map.put(FIELD_FACTORY_CODE, StringUtils.toString(factoryCode, eiMetadata.getMeta(FIELD_FACTORY_CODE)));
 		
 		return map;
 	}

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

@@ -50,6 +50,7 @@ public class ServiceHPKC003 extends ServiceBase {
 		try {
 			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);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC003().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

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

@@ -39,7 +39,8 @@
         PART_WIDTH as "partWidth",  <!-- 零件-宽 -->
         PART_THICK as "partThick",  <!-- 零件-厚 -->
         PART_SPEC as "partSpec",  <!-- 零件规格 -->
-        REMARK1 as "remark1" <!-- 备注 -->
+        REMARK1 as "remark1", <!-- 备注 -->
+        FACTORY_CODE as "factoryCode"  <!-- 厂区编码 -->
     </sql>
 
     <sql id="condition">
@@ -82,6 +83,9 @@
         <isNotEmpty prepend=" AND " property="deleteFlag">
             DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            FACTORY_CODE = #factoryCode#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -152,14 +156,15 @@
             PART_WIDTH,  <!-- 零件-宽 -->
             PART_THICK,  <!-- 零件-厚 -->
             PART_SPEC,  <!-- 零件规格 -->
-            REMARK1  <!-- 备注 -->
+            REMARK1,  <!-- 备注 -->
+            FACTORY_CODE  <!-- 厂区编码 -->
         ) VALUES (
             #companyCode#, #depCode#, #documentDate#, #prodNo#, #whCode#, #whName#, #amount#,
             #weight#, #remark#, #createdBy#, #createdName#, #createdTime#, #prodOrderNo#,
             #prodTaskNo#, #deleteFlag#, #prodNoOld#, #projCode#, #projName#, #prdtType#,
             #prdtCode#, #prdtName#, #prdtLength#, #prdtWidth#, #prdtThick#, #prdtSpec#,
             #partType#, #partCode#, #partName#, #partLength#, #partWidth#, #partThick#,
-            #partSpec#, #remark1#
+            #partSpec#, #remark1#, #factoryCode#
         )
     </insert>
 
@@ -191,13 +196,14 @@
             PRDT_CODE AS "prdtCode",
             PART_CODE AS "partCode",
             COALESCE(SUM(AMOUNT), 0) AS "amount",
-            COALESCE(SUM(WEIGHT), 0) AS "weight"
+            COALESCE(SUM(WEIGHT), 0) AS "weight",
+            FACTORY_CODE as "factoryCode"
         FROM ${hpjxSchema}.T_HPKC003
         WHERE 1=1
         <isNotEmpty prepend=" AND " property="createdTimeFrom">
             CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
         </isNotEmpty>
-        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, PROJ_CODE, PRDT_CODE, PART_CODE
+        GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, PROJ_CODE, PRDT_CODE, PART_CODE, FACTORY_CODE
     </select>
 
 </sqlMap>

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

@@ -10,16 +10,16 @@
 	    <div class="row">
 		    <EF:EFDatePicker cname="单据日期" ename="documentDate" blockId="inqu_status" row="0" colWidth="3"
 		                     format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFSelect cname="厂区" blockId="inqu_status" ename="factoryCode" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		    <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
 		    <EF:EFSelect cname="仓库名称" ename="whCode" blockId="inqu_status" row="0" colWidth="3"
 		                 filter="contains" defultValue="">
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
 		    </EF:EFSelect>
-		    <EF:EFSelect cname="是否删除" ename="deleteFlag" blockId="inqu_status" row="0" colWidth="3" defaultValue="0">
-			    <EF:EFOption label="全部" value=""/>
-			    <EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
-		    </EF:EFSelect>
 	    </div>
 	    <div class="row">
 		    <EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
@@ -30,6 +30,10 @@
 			</EF:EFDateSpan>
 	    </div>
 	    <div class="row">
+			<EF:EFSelect cname="是否删除" ename="deleteFlag" blockId="inqu_status" row="0" colWidth="3" defaultValue="0">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
+			</EF:EFSelect>
 				<%--		    <EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3"/>
                 <EF:EFInput cname="生产任务号" ename="prodTaskNo" blockId="inqu_status" row="0" colWidth="3"/>--%>
 	    </div>
@@ -42,6 +46,10 @@
 			<EF:EFColumn ename="documentDate" cname="单据日期" width="100" align="center" editType="date" readonly="true"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<%--<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>--%>
+			<EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue="" required="true"
+							  filter="contains">
+				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+			</EF:EFComboColumn>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFComboColumn ename="whCode" cname="仓库名称" enable="false" width="120" align="center"
 			                  blockName="wh_record_block_id" textField="textField" valueField="valueField"