生产下料

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

@@ -66,6 +66,8 @@ public class HPSC002A extends DaoEPBase {
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 修改时间*/
 
+	private String bizType = " ";		/* 业务类型*/
+
 	/**
 	 * initialize the metadata.
 	 */
@@ -121,7 +123,9 @@ public class HPSC002A extends DaoEPBase {
 		eiColumn.setDescName("修改时间");
 		eiMetadata.addMeta(eiColumn);
 
-		
+		eiColumn = new EiColumn("bizType");
+		eiColumn.setDescName("业务类型");
+		eiMetadata.addMeta(eiColumn);
 	}
 	
 	/**
@@ -324,6 +328,22 @@ public class HPSC002A extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 	/**
+	 * get the bizType - .
+	 * @return the bizType
+	 */
+	public String getBizType() {
+		return this.bizType;
+	}
+
+	/**
+	 * set the bizType -
+	 *
+	 * @param bizType -
+	 */
+	public void setBizType(String bizType) {
+		this.bizType = bizType;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -343,6 +363,7 @@ public class HPSC002A extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+		setBizType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("bizType")), bizType));
 	}
 	
 	/**
@@ -364,6 +385,7 @@ public class HPSC002A extends DaoEPBase {
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+		map.put("bizType", StringUtils.toString(bizType, eiMetadata.getMeta("bizType")));
 
 		return map;
 	}

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

@@ -48,11 +48,11 @@ public class HPSC002B extends DaoEPBase {
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 修改人名称*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 修改时间*/
 
-	public static final String QUERY = "HPSC002B.query";
-	public static final String COUNT = "HPSC002B.count";
-	public static final String INSERT = "HPSC002B.insert";
-	public static final String UPDATE = "HPSC002B.update";
-	public static final String DELETE = "HPSC002B.delete";
+	public static final String QUERY = "HPSC002A.query";
+	public static final String COUNT = "HPSC002A.count";
+	public static final String INSERT = "HPSC002A.insert";
+	public static final String UPDATE = "HPSC002A.update";
+	public static final String DELETE = "HPSC002A.delete";
 
 	private Long id = null;	/* 主键ID*/
 	private String companyCode = " ";		/* 企业编码 预留*/
@@ -67,6 +67,8 @@ public class HPSC002B extends DaoEPBase {
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 修改时间*/
 
+	private String bizType = " ";		/* 业务类型*/
+
 	/**
 	 * initialize the metadata.
 	 */
@@ -122,7 +124,9 @@ public class HPSC002B extends DaoEPBase {
 		eiColumn.setDescName("修改时间");
 		eiMetadata.addMeta(eiColumn);
 
-		
+		eiColumn = new EiColumn("bizType");
+		eiColumn.setDescName("业务类型");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -325,6 +329,22 @@ public class HPSC002B extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 	/**
+	 * get the bizType - .
+	 * @return the bizType
+	 */
+	public String getBizType() {
+		return this.bizType;
+	}
+
+	/**
+	 * set the bizType -
+	 *
+	 * @param bizType -
+	 */
+	public void setBizType(String bizType) {
+		this.bizType = bizType;
+	}
+	/**
 	 * get the value from Map.
 	 *
 	 * @param map - source data map
@@ -344,6 +364,7 @@ public class HPSC002B extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
+		setBizType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("bizType")), bizType));
 	}
 
 	/**
@@ -365,6 +386,7 @@ public class HPSC002B extends DaoEPBase {
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
+		map.put("bizType", StringUtils.toString(bizType, eiMetadata.getMeta("bizType")));
 
 		return map;
 	}

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

@@ -335,6 +335,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 Map sqlMap = new HashMap();
                 sqlMap.put("id",hppz002.getId());
                 sqlMap.put("filePath1",hppz002.getFilePath1());
+                sqlMap.put("bizType","WL");
                 DaoUtils.update("HPSC002.bindDocIdById", hppz002.toMap());
             }
         } catch (PlatException e) {

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

@@ -43,6 +43,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
 			List<HPSC002> dbSc002s = dao.query("HPSC002.query", queryMap);
 			if (CollectionUtils.isNotEmpty(dbSc002s)) {
 				HPSC002 dbSc002 = dbSc002s.get(0);
+				inInfo.set("inqu_status-0-bizType", queryMap.get("bizType"));
 				inInfo.set("inqu_status-0-matId", queryMap.get("id"));
 				inInfo.set("inqu_status-0-projName", dbSc002.getProjName());
 				inInfo.set("inqu_status-0-prdtName", dbSc002.getPrdtName());

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

@@ -94,6 +94,10 @@ public class ServiceHPSC006 extends ServiceBase {
                 BigDecimal unitWt = HPSC006.getUnitWt();
                 DecimalFormat decimalFormat = new DecimalFormat("#.000");
                 BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue())));
+                HPSC006.setInventSpec(HPPZTools.jointSpec(HPSC006.getInventLength(),HPSC006.getInventWidth(),HPSC006.getInventThick()));
+                HPSC006.setProjCode(projCode);
+                HPSC006.setProjName(projName);
+                HPSC006.setProductionOrderNo(productionOrderNo);
                 HPSC006.setStatus(CommonConstant.YesNo.NO_0.intValue());
                 HPSC006.setTotalWt(totalWt);
                 HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
@@ -119,6 +123,9 @@ public class ServiceHPSC006 extends ServiceBase {
     public EiInfo update(EiInfo inInfo) {
         try {
             HPSC006 HPSC006 = new HPSC006();
+            String productionOrderNo = inInfo.getString("productionOrderNo");
+            String projCode = inInfo.getString("projCode");
+            String projName = inInfo.getString("projName");
             EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
@@ -127,6 +134,10 @@ public class ServiceHPSC006 extends ServiceBase {
                 BigDecimal unitWt = HPSC006.getUnitWt();
                 DecimalFormat decimalFormat = new DecimalFormat("#.000");
                 BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue())));
+                HPSC006.setInventSpec(HPPZTools.jointSpec(HPSC006.getInventLength(),HPSC006.getInventWidth(),HPSC006.getInventThick()));
+                HPSC006.setProjCode(projCode);
+                HPSC006.setProjName(projName);
+                HPSC006.setProductionOrderNo(productionOrderNo);
                 HPSC006.setTotalWt(totalWt);
                 HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
                 DaoUtils.update("HPSC006.update",HPSC006);

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

@@ -458,7 +458,7 @@
 	</update>
 
 	<update id="bindDocIdById">
-		UPDATE hpjx.t_hpsc002  SET  FILE_PATH1 = #filePath1# WHERE ID = #id#
+		UPDATE hpjx.t_hpsc002  SET  FILE_PATH1 = #filePath1# WHERE ID = #id# AND BIZ_TYPE = #bizType#
 	</update>
 
 

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

@@ -6,6 +6,7 @@
         A.ID as "id",
         A.COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
         A.DEPT_CODE as "deptCode",  <!-- 部门编码 预留 -->
+        A.BIZ_TYPE as "bizType",  <!-- 物料ID -->
         A.MAT_ID as "matId",  <!-- 物料ID -->
         A.DOC_ID as "docId",  <!-- 文件ID -->
         B.DOC_NAME as "docName",  <!-- 文件名称 -->
@@ -27,6 +28,9 @@
 		<isNotEmpty prepend=" AND " property="deptCode">
             A.DEPT_CODE = #deptCode#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="bizType">
+            A.BIZ_TYPE = #bizType#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="matId">
             A.MAT_ID = #matId#
         </isNotEmpty>
@@ -95,13 +99,14 @@
 		INSERT INTO ${hpjxSchema}.T_HPSC002A (
             COMPANY_CODE,  <!-- 企业编码 预留 -->
             DEPT_CODE,  <!-- 部门编码 预留 -->
+            BIZ_TYPE,
             MAT_ID,  <!-- 物料ID -->
             DOC_ID,  <!-- 文件ID -->
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
             CREATED_TIME  <!-- 创建时间 -->
         ) VALUES (
-            #companyCode#, #deptCode#, #matId#, #docId#, #createdBy#,
+            #companyCode#, #deptCode#, #bizType#, #matId#, #docId#, #createdBy#,
             #createdName#, #createdTime#
         )
 	</insert>

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

@@ -6,6 +6,7 @@
         A.ID as "id",
         A.COMPANY_CODE as "companyCode",  <!-- 企业编码 预留 -->
         A.DEPT_CODE as "deptCode",  <!-- 部门编码 预留 -->
+        A.BIZ_TYPE as "bizType",  <!-- 物料ID -->
         A.MAT_ID as "matId",  <!-- 物料ID -->
         A.DOC_ID as "docId",  <!-- 文件ID -->
         B.DOC_NAME as "docName",  <!-- 文件名称 -->
@@ -27,6 +28,9 @@
 		<isNotEmpty prepend=" AND " property="deptCode">
             A.DEPT_CODE = #deptCode#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="bizType">
+            A.BIZ_TYPE = #bizType#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="matId">
             A.MAT_ID = #matId#
         </isNotEmpty>
@@ -98,13 +102,14 @@
         INSERT INTO ${hpjxSchema}.T_HPSC002A (
         COMPANY_CODE,  <!-- 企业编码 预留 -->
         DEPT_CODE,  <!-- 部门编码 预留 -->
+        BIZ_TYPE,
         MAT_ID,  <!-- 物料ID -->
         DOC_ID,  <!-- 文件ID -->
         CREATED_BY,  <!-- 创建人 -->
         CREATED_NAME,  <!-- 创建人名称 -->
         CREATED_TIME  <!-- 创建时间 -->
         ) VALUES (
-            #companyCode#, #deptCode#, #matId#, #docId#, #createdBy#,
+        #companyCode#, #deptCode#, #bizType#, #matId#, #docId#, #createdBy#,
         #createdName#, #createdTime#
         )
 	</insert>

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

@@ -377,7 +377,7 @@ function openUploadFile(id) {
  */
 function showUploadFile(id) {
 	JSColorbox.open({
-		href: "HPSC002A?methodName=initLoad&inqu_status-0-id=" + id,
+		href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType='WL'?inqu_status-0-id=" + id,
 		title: "<div style='text-align: center;'>附件清单</div>",
 		width: "80%",
 		height: "80%",

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

@@ -152,7 +152,7 @@ $(function () {
 
 function showUploadFile(id) {
     JSColorbox.open({
-        href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
+        href: "HPSC002B?methodName=initLoad&inqu_status-0-bizType='WL'?inqu_status-0-id=" + id,
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",

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

@@ -92,7 +92,7 @@ function jump(productionOrderNo) {
 }
 function showUploadFile(id) {
     JSColorbox.open({
-        href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
+        href: "HPSC002B?methodName=initLoad&inqu_status-0-bizType='WL'?inqu_status-0-id=" + id,
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",

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

@@ -94,14 +94,18 @@ $(function () {
                 {
                     field: "operator",
                     template: function (item) {
-                        let filePath1 = item.filePath1;
                         let template = '';
-                        if (filePath1) {
                             template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
                                 + 'onclick="showUploadFile(' + filePath1 + ')"  >附件清单</a>';
-                        }
                         return template
                     }
+                },{
+                    field: "inventName",
+                    query: function (container, options) {
+                        let eiInfo = new EiInfo();
+                        eiInfo.set("inventType", options.model["inventType"]);
+                        return eiInfo;
+                    }
                 }
             ],
 
@@ -114,7 +118,7 @@ query = function () {
 }
 function showUploadFile(id) {
     JSColorbox.open({
-        href: "HPSC002B?methodName=initLoad&inqu_status-0-id=" + id,
+        href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType='XL'?inqu_status-0-id=" + id,
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",

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

@@ -56,6 +56,8 @@
                 <EF:EFOption label="部分派工" value="1"/>
                 <EF:EFOption label="全部派工" value="2"/>
             </EF:EFComboColumn>
+            <EF:EFColumn enable="false" ename="factoryName" cname="厂区名称"/>
+            <EF:EFColumn enable="false" ename="orgName" cname="生产组"/>
         </EF:EFGrid>
     </EF:EFRegion>
 
@@ -69,16 +71,16 @@
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('7')"/>
             </EF:EFComboColumn>
             <EF:EFPopupColumn ename="inventName" cname="材料名称" width="200" popupType="ServiceGrid"
-                              popupTitle="材料信息" serviceName="HPPZ004" methodName="queryComboBox" resultId="invent_prdt_name_block_id"
-                              columnEnames="inventName,inventCode"
+                              popupTitle="材料信息" serviceName="HPPZ004" methodName="queryComboBox" resultId="invent_name_block_id"
+                              columnEnames="textField,valueField"
                               columnCnames="材料名称,材料编码"
-                              backFillColumnIds="inventName,inventCode"
+                              backFillColumnIds="textField,valueField"
                               backFillFieldIds="inventName,inventCode"
-                              valueField="inventName" textField="inventName"/>
-            <EF:EFColumn ename="inventCode"  cname="材料编码"/>
-            <EF:EFColumn ename="length"  cname="长" format="{0:N3}"/>
-            <EF:EFColumn ename="width"  cname="宽" format="{0:N3}"/>
-            <EF:EFColumn ename="thick"  cname="厚" format="{0:N3}"/>
+                              valueField="textField" textField="textField"/>
+            <EF:EFColumn ename="inventCode" enable="false" cname="材料编码"/>
+            <EF:EFColumn ename="inventLength"  cname="长" format="{0:N3}"/>
+            <EF:EFColumn ename="inventWidth"  cname="宽" format="{0:N3}"/>
+            <EF:EFColumn ename="inventThick"  cname="厚" format="{0:N3}"/>
             <EF:EFColumn ename="remark" cname="备注" />
             <EF:EFColumn ename="num" cname="计划数量"/>
             <EF:EFColumn ename="unitWt" format="{0:N3}" cname="计划单重"/>
@@ -87,6 +89,13 @@
             <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
                          enable="false"/>
             <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" readonly="true"/>
+            <EF:EFComboColumn enable="false" align="center" ename="status" cname="状态">
+                <EF:EFOption label="计划中" value="0"/>
+                <EF:EFOption label="生产中" value="1"/>
+                <EF:EFOption label="已完成" value="2"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn enable="false" ename="factoryName" cname="厂区名称"/>
+            <EF:EFColumn enable="false" ename="orgName" cname="生产组"/>
             <EF:EFColumn ename="operator" cname="操作" width="100"  enable="false" readonly="false"/>
         </EF:EFGrid>
     </EF:EFRegion>