生产订单分派

生成生产入库单
生产入库单红冲
同步生产计划

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

@@ -27,6 +27,9 @@ public class HPKC003 extends DaoEPBase {
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 	public static final String FIELD_DOCUMENT_DATE = "documentDate";    		/* 单据日期*/
 	public static final String FIELD_PROD_NO = "prodNo";    		/* 生产入库单号*/
+	public static final String FIELD_PROD_NO_OLD = "prodNoOld";    		/* 生产入库单号(旧)*/
+
+	public static final String FIELD_PRODUCTION_ORDER_NO = "productionOrderNo";    		/* 生产订单号*/
 	public static final String FIELD_WH_CODE = "whCode";    		/* 仓库编码*/
 	public static final String FIELD_WH_NAME = "whName";    		/* 仓库名称*/
 	public static final String FIELD_INVENT_TYPE = "inventType";    		/* 物料类型*/
@@ -41,12 +44,17 @@ public class HPKC003 extends DaoEPBase {
 	public static final String FIELD_UPDATED_BY = "updatedBy";    		/* 更新人*/
 	public static final String FIELD_UPDATED_TIME = "updatedTime";    		/* 更新时间*/
 	public static final String FIELD_UPDATED_NAME = "updatedName";    		/* 修改人名称*/
+	public static final String FIELD_DELETE_FLAG = "deleteFlag";    		/* 是否删除0:否1.是*/
+
 
 	public static final String COL_ID = "ID";
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 	public static final String COL_DOCUMENT_DATE = "DOCUMENT_DATE";    		/* 单据日期*/
 	public static final String COL_PROD_NO = "PROD_NO";    		/* 生产入库单号*/
+	public static final String COL_PROD_NO_OLD = "PROD_NO_OLD";    		/* 生产入库单号*/
+
+	public static final String COL_PRODUCTION_ORDER_NO = "PRODUCTION_ORDER_NO";    		/* 生产订单号*/
 	public static final String COL_WH_CODE = "WH_CODE";    		/* 仓库编码*/
 	public static final String COL_WH_NAME = "WH_NAME";    		/* 仓库名称*/
 	public static final String COL_INVENT_TYPE = "INVENT_TYPE";    		/* 物料类型*/
@@ -61,12 +69,15 @@ public class HPKC003 extends DaoEPBase {
 	public static final String COL_UPDATED_BY = "UPDATED_BY";    		/* 更新人*/
 	public static final String COL_UPDATED_TIME = "UPDATED_TIME";    		/* 更新时间*/
 	public static final String COL_UPDATED_NAME = "UPDATED_NAME";    		/* 修改人名称*/
+	public static final String COL_DELETE_FLAG = "DELETE_FLAG";    		/* 物料类型*/
 
 	private Long id = null;
 	private String companyCode = " ";		/* 企业编码 预留*/
 	private String depCode = " ";		/* 部门编码*/
 	private String documentDate = " ";		/* 单据日期*/
 	private String prodNo = " ";		/* 生产入库单号*/
+	private String prodNoOld = " ";		/* 生产入库单号(旧)*/
+	private String productionOrderNo = " ";		/* 生产订单号*/
 	private String whCode = " ";		/* 仓库编码*/
 	private String whName = " ";		/* 仓库名称*/
 	private Integer inventType;	/* 物料类型*/
@@ -81,6 +92,7 @@ public class HPKC003 extends DaoEPBase {
 	private String updatedBy = " ";		/* 更新人*/
 	private String updatedTime = " ";		/* 更新时间*/
 	private String updatedName = " ";		/* 修改人名称*/
+	private Integer deleteFlag;	/* 是否删除0:否1.是*/
 
 	/**
 	 * initialize the metadata.
@@ -109,6 +121,14 @@ public class HPKC003 extends DaoEPBase {
 		eiColumn.setDescName("生产入库单号");
 		eiMetadata.addMeta(eiColumn);
 
+		eiColumn = new EiColumn(FIELD_PROD_NO_OLD);
+		eiColumn.setDescName("生产入库单号(旧)");
+		eiMetadata.addMeta(eiColumn);
+
+		eiColumn = new EiColumn(FIELD_PRODUCTION_ORDER_NO);
+		eiColumn.setDescName("生产订单号");
+		eiMetadata.addMeta(eiColumn);
+
 		eiColumn = new EiColumn(FIELD_WH_CODE);
 		eiColumn.setDescName("仓库编码");
 		eiMetadata.addMeta(eiColumn);
@@ -171,7 +191,9 @@ public class HPKC003 extends DaoEPBase {
 		eiColumn.setDescName("修改人名称");
 		eiMetadata.addMeta(eiColumn);
 
-
+		eiColumn = new EiColumn(FIELD_DELETE_FLAG);
+		eiColumn.setDescName("是否删除0:否1.是");
+		eiMetadata.addMeta(eiColumn);
 	}
 
 	/**
@@ -262,6 +284,39 @@ public class HPKC003 extends DaoEPBase {
 		this.prodNo = prodNo;
 	}
 	/**
+	 * get the prodNoOld - 生产入库单号.
+	 * @return the prodNoOld
+	 */
+	public String getProdNoOld() {
+		return this.prodNoOld;
+	}
+
+	/**
+	 * set the prodNoOld - 生产入库单号.
+	 *
+	 * @param prodNoOld - 生产入库单号
+	 */
+	public void setProdNoOld(String prodNoOld) {
+		this.prodNoOld = prodNoOld;
+	}
+
+	/**
+	 * get the productionOrderNo - 生产订单号.
+	 * @return the productionOrderNo
+	 */
+	public String getProductionOrderNo() {
+		return this.productionOrderNo;
+	}
+
+	/**
+	 * set the productionOrderNo - 生产订单号.
+	 *
+	 * @param productionOrderNo - 生产订单号
+	 */
+	public void setProductionOrderNo(String productionOrderNo) {
+		this.productionOrderNo = productionOrderNo;
+	}
+	/**
 	 * get the whCode - 仓库编码.
 	 * @return the whCode
 	 */
@@ -485,6 +540,23 @@ public class HPKC003 extends DaoEPBase {
 	public void setUpdatedName(String updatedName) {
 		this.updatedName = updatedName;
 	}
+
+	/**
+	 * get the deleteFlag - 物料类型.
+	 * @return the deleteFlag
+	 */
+	public Integer getDeleteFlag() {
+		return this.deleteFlag;
+	}
+
+	/**
+	 * set the deleteFlag - 物料类型.
+	 *
+	 * @param deleteFlag - 物料类型
+	 */
+	public void setDeleteFlag(Integer deleteFlag) {
+		this.deleteFlag = deleteFlag;
+	}
 	/**
 	 * get the value from Map.
 	 *
@@ -498,6 +570,8 @@ public class HPKC003 extends DaoEPBase {
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 		setDocumentDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DOCUMENT_DATE)), documentDate));
 		setProdNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_NO)), prodNo));
+		setProdNoOld(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_NO_OLD)), prodNoOld));
+		setProductionOrderNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCTION_ORDER_NO)), productionOrderNo));
 		setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
 		setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
 		setInventType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
@@ -512,6 +586,8 @@ public class HPKC003 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
+		setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
+
 	}
 
 	/**
@@ -526,6 +602,8 @@ public class HPKC003 extends DaoEPBase {
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 		map.put(FIELD_DOCUMENT_DATE, StringUtils.toString(documentDate, eiMetadata.getMeta(FIELD_DOCUMENT_DATE)));
 		map.put(FIELD_PROD_NO, StringUtils.toString(prodNo, eiMetadata.getMeta(FIELD_PROD_NO)));
+		map.put(FIELD_PROD_NO_OLD, StringUtils.toString(prodNoOld, eiMetadata.getMeta(FIELD_PROD_NO_OLD)));
+		map.put(FIELD_PRODUCTION_ORDER_NO, StringUtils.toString(productionOrderNo, eiMetadata.getMeta(FIELD_PRODUCTION_ORDER_NO)));
 		map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
 		map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));
 		map.put(FIELD_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
@@ -540,6 +618,7 @@ public class HPKC003 extends DaoEPBase {
 		map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
 		map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
 		map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
+		map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
 
 		return map;
 	}

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

@@ -6,6 +6,7 @@ import com.baosight.hpjx.hp.constant.HPConstant;
 import com.baosight.hpjx.hp.kc.domain.HPKC003;
 import com.baosight.hpjx.hp.pz.domain.HPPZ009;
 import com.baosight.hpjx.hp.pz.tools.HPPZTools;
+import com.baosight.hpjx.hp.sc.domain.HPSC004;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
 import com.baosight.hpjx.util.LogUtils;
@@ -14,13 +15,14 @@ import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 import com.baosight.iplat4j.ed.util.SequenceGenerator;
 
 import org.apache.commons.collections.MapUtils;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @author:songx
@@ -88,6 +90,9 @@ public class ServiceHPKC003 extends ServiceBase {
 				// 生成入库单号
 				fKc003.setProdNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC003_PROD_NO));
 				DaoUtils.insert("HPKC003.insert", fKc003);
+
+				//同步生产计划
+				this.synchronousPlan(fKc003);
 			}
 			inInfo = this.query(inInfo);
 			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
@@ -141,6 +146,16 @@ public class ServiceHPKC003 extends ServiceBase {
 				Map<?, ?> map = eiBlock.getRow(i);
 				hpkc003.fromMap(map);
 				this.dao.delete("HPKC003.delete", hpkc003.toMap());
+
+				//生产一条负数量和产量的红冲记录
+				hpkc003.setAmount(hpkc003.getAmount().multiply(new BigDecimal(-1.000)));
+				hpkc003.setWeight(hpkc003.getWeight().multiply(new BigDecimal(-1.000)));
+				hpkc003.setDeleteFlag(0);
+				hpkc003.setProdNoOld(hpkc003.getProdNo());
+				hpkc003.setProdNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPKC003_PROD_NO));
+				DaoUtils.insert("HPKC003.insert", hpkc003);
+				//同步生产计划
+				this.synchronousPlan(hpkc003);
 			}
 			eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
 			eiInfo.setMsg("删除成功！");
@@ -151,4 +166,29 @@ public class ServiceHPKC003 extends ServiceBase {
 	}
 
 
+	/**
+	 * 新增入库及删除入库单做同步计划订单
+	 * @param hpkc003
+	 */
+	public void synchronousPlan(HPKC003 hpkc003) {
+		HPSC004 HPSC004 = (HPSC004) this.dao.get("HPSC004.queryDetail","productionOrderNo",hpkc003.getProductionOrderNo());
+		if (HPSC004 != null) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			BigDecimal actualCompletionNum = hpkc003.getAmount().add(HPSC004.getNum());
+			BigDecimal actualCompletionUnitWt = hpkc003.getWeight().add(HPSC004.getActualCompletionUnitWt());
+			HPSC004.setActualCompletionNum(actualCompletionNum);
+			HPSC004.setActualCompletionUnitWt(actualCompletionUnitWt);
+			HPSC004.setUpdatedBy(UserSession.getUserId());
+			HPSC004.setUpdatedTime(sdf.format(new Date()));
+			//计算是否生产完成
+			if (HPSC004.getNum().compareTo(actualCompletionNum) <  0
+					&& HPSC004.getUnitWt().compareTo(actualCompletionUnitWt) < 0) {
+				HPSC004.setActualCompletionDate(sdf.format(new Date()));
+			} else {
+				HPSC004.setActualCompletionDate("");
+			}
+			this.dao.update("HPSC004.update", HPSC004.toMap());
+		}
+	}
+	
 }

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

+package com.baosight.hpjx.hp.kc.service;
+
+import com.baosight.hpjx.hp.sc.domain.HPSC005;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+
+/**
+ *
+ */
+public class ServiceHPKC099 extends ServiceBase {
+
+
+    /**
+     * 画面初始化.
+     */
+    public EiInfo initLoad(EiInfo inInfo) {
+        HPSC005 HPSC005 = new HPSC005();
+        inInfo.set("inqu_status-0-status", "1");
+        EiInfo outInfo = super.initLoad(inInfo, HPSC005);
+        outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC005.eiMetadata);
+        return inInfo;
+    }
+
+
+    /**
+     * 查询操作.
+     */
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        /* 调用EI查询方法.*/
+        inInfo.set("inqu_status-0-status", "1");
+        EiInfo outInfo = super.query(inInfo, "HPSC005.query", new HPSC005());
+        return outInfo;
+
+    }
+
+}

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

@@ -8,6 +8,7 @@
         DEP_CODE as "depCode",  <!-- 部门编码 -->
         DOCUMENT_DATE as "documentDate",  <!-- 单据日期 -->
         PROD_NO as "prodNo",  <!-- 生产入库单号 -->
+        PRODUCTION_ORDER_NO as "productionOrderNo",  <!-- 生产订单号 -->
         WH_CODE as "whCode",  <!-- 仓库编码 -->
         WH_NAME as "whName",  <!-- 仓库名称 -->
         INVENT_TYPE as "inventType",  <!-- 物料类型 -->
@@ -34,6 +35,9 @@
         <isNotEmpty prepend=" AND " property="prodNo">
             PROD_NO = #prodNo#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="productionOrderNo">
+            PRODUCTION_ORDER_NO = #productionOrderNo#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="whCode">
             WH_CODE = #whCode#
         </isNotEmpty>
@@ -64,13 +68,13 @@
 
 	<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC003">
 		SELECT <include refid="column"/>
-		FROM hpjx.t_hpkc003 WHERE 1=1
+		FROM hpjx.t_hpkc003 WHERE 1=1 AND DELETE_FLAG = 0
 		<include refid="condition"/>
         <include refid="order"/>
 	</select>
 
 	<select id="count" resultClass="int">
-		SELECT COUNT(*) FROM hpjx.t_hpkc003 WHERE 1=1
+		SELECT COUNT(*) FROM hpjx.t_hpkc003 WHERE 1=1 AND DELETE_FLAG = 0
 		<include refid="condition"/>
 	</select>
 
@@ -80,6 +84,8 @@
             DEP_CODE,  <!-- 部门编码 -->
             DOCUMENT_DATE,  <!-- 单据日期 -->
             PROD_NO,  <!-- 生产入库单号 -->
+            PROD_NO_OLD,  <!-- 生产入库单号 -->
+            PRODUCTION_ORDER_NO,  <!-- 生产订单号 -->
             WH_CODE,  <!-- 仓库编码 -->
             WH_NAME,  <!-- 仓库名称 -->
             INVENT_TYPE,  <!-- 物料类型 -->
@@ -90,17 +96,19 @@
             REMARK,  <!-- 备注 -->
             CREATED_BY,  <!-- 创建人 -->
             CREATED_NAME,  <!-- 创建人名称 -->
-            CREATED_TIME  <!-- 创建时间 -->
+            CREATED_TIME,  <!-- 创建时间 -->
+            DELETE_FLAG
         ) VALUES (
-            #companyCode#, #depCode#, #documentDate#, #prodNo#, #whCode#, #whName#,
+            #companyCode#, #depCode#, #documentDate#, #prodNo#, #prodNoOld#, #productionOrderNo#, #whCode#, #whName#,
             #inventType#, #inventCode#, #inventName#, #amount#, #weight#, #remark#,
-            #createdBy#, #createdName#, #createdTime#
+            #createdBy#, #createdName#, #createdTime#, 0
         )
     </insert>
 
-	<delete id="delete">
-		DELETE FROM hpjx.t_hpkc003 WHERE ID = #id#
-	</delete>
+	<update id="delete">
+        UPDATE ${hpjxSchema}.T_HPKC003
+        SET DELETE_FLAG = 1 WHERE ID = #id#
+	</update>
 
 	<update id="update">
         UPDATE ${hpjxSchema}.T_HPKC003

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

@@ -112,7 +112,7 @@ public class HPSC004 extends DaoEPBase {
 	private String icon = " ";		/* 图片地址*/
 	private String prdtCode = " ";		/* 产品编码*/
 	private String prdtName = " ";		/* 产品名称*/
-	private Integer num = new Integer(0);		/* 数量*/
+	private BigDecimal num = new BigDecimal(0.000);		/* 数量*/
 	private BigDecimal unitWt = new BigDecimal(0.000);		/* 单重*/
 	private BigDecimal totalWt = new BigDecimal(0.000);		/* 总重*/
 	private String filePath1 = " ";		/* 文件地址1*/
@@ -123,8 +123,8 @@ public class HPSC004 extends DaoEPBase {
 	private String planCommentDate = " ";		/* 计划开始时间*/
 	private String planCompletionDate = " ";		/* 计划结束时间*/
 	private String actualCompletionDate = " ";		/* 实际完工日期*/
-	private Integer actualCompletionNum = new Integer(0);		/* 实际完工数量*/
-	private BigDecimal actualCompletionUnitWt = new BigDecimal("0");		/* 实际完工重量*/
+	private BigDecimal actualCompletionNum = new BigDecimal(0.000);		/* 实际完工数量*/
+	private BigDecimal actualCompletionUnitWt = new BigDecimal(0.000);		/* 实际完工重量*/
 	private String productionOrderNo = " ";		/* 生产订单号*/
 	private Integer status = new Integer(0);		/* 状态   0-未审核，1-已审核*/
 	private Integer delStatus = new Integer(0);		/* 状态   1未删除，0已删除*/
@@ -508,7 +508,7 @@ public class HPSC004 extends DaoEPBase {
 	 * get the num - 数量.
 	 * @return the num
 	 */
-	public Integer getNum() {
+	public BigDecimal getNum() {
 		return this.num;
 	}
 
@@ -517,7 +517,7 @@ public class HPSC004 extends DaoEPBase {
 	 *
 	 * @param num - 数量
 	 */
-	public void setNum(Integer num) {
+	public void setNum(BigDecimal num) {
 		this.num = num;
 	}
 	/**
@@ -684,7 +684,7 @@ public class HPSC004 extends DaoEPBase {
 	 * get the actualCompletionNum - 实际完工数量.
 	 * @return the actualCompletionNum
 	 */
-	public Integer getActualCompletionNum() {
+	public BigDecimal getActualCompletionNum() {
 		return this.actualCompletionNum;
 	}
 
@@ -693,7 +693,7 @@ public class HPSC004 extends DaoEPBase {
 	 *
 	 * @param actualCompletionNum - 实际完工数量
 	 */
-	public void setActualCompletionNum(Integer actualCompletionNum) {
+	public void setActualCompletionNum(BigDecimal actualCompletionNum) {
 		this.actualCompletionNum = actualCompletionNum;
 	}
 	/**
@@ -861,7 +861,7 @@ public class HPSC004 extends DaoEPBase {
 		setIcon(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ICON)), icon));
 		setPrdtCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_CODE)), prdtCode));
 		setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
-		setNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_NUM)), num));
+		setNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_NUM)), num));
 		setUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UNIT_WT)), unitWt));
 		setTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_WT)), totalWt));
 		setFilePath1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FILE_PATH1)), filePath1));
@@ -872,7 +872,7 @@ public class HPSC004 extends DaoEPBase {
 		setPlanCommentDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_COMMENT_DATE)), planCommentDate));
 		setPlanCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_COMPLETION_DATE)), planCompletionDate));
 		setActualCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_DATE)), actualCompletionDate));
-		setActualCompletionNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_NUM)), actualCompletionNum));
+		setActualCompletionNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_NUM)), actualCompletionNum));
 		setActualCompletionUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_UNIT_WT)), actualCompletionUnitWt));
 		setProductionOrderNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRODUCTION_ORDER_NO)), productionOrderNo));
 		setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));

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

@@ -85,7 +85,7 @@ public class HPSC005 extends DaoEPBase {
 	private String prdtCode = " ";		/* 产品编码*/
 	private String prdtName = " ";		/* 产品名称*/
 	private String planCompletionDate = " ";		/* 计划完成日期*/
-	private Integer num = new Integer(0);		/* 计划数量*/
+	private BigDecimal num = new BigDecimal(0.000);			/* 计划数量*/
 	private BigDecimal totalWt = new BigDecimal(0.000);		/* 计划重量*/
 	private Integer status = new Integer(0);		/* 状态   0-未派工，1-已派工*/
 	private String orgNo = " ";		/* 生产组编码*/
@@ -347,7 +347,7 @@ public class HPSC005 extends DaoEPBase {
 	 * get the num - 计划数量.
 	 * @return the num
 	 */
-	public Integer getNum() {
+	public BigDecimal getNum() {
 		return this.num;
 	}
 
@@ -356,7 +356,7 @@ public class HPSC005 extends DaoEPBase {
 	 *
 	 * @param num - 计划数量
 	 */
-	public void setNum(Integer num) {
+	public void setNum(BigDecimal num) {
 		this.num = num;
 	}
 	/**
@@ -616,7 +616,7 @@ public class HPSC005 extends DaoEPBase {
 		setPrdtCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_CODE)), prdtCode));
 		setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
 		setPlanCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PLAN_COMPLETION_DATE)), planCompletionDate));
-		setNum(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_NUM)), num));
+		setNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_NUM)), num));
 		setTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_WT)), totalWt));
 		setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
 		setOrgNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ORG_NO)), orgNo));

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

@@ -39,7 +39,7 @@ public class THPSC002 extends DaoEPBase {
     private String icon = " ";        /* 图片地址*/
     private String prdtCode = " ";        /* 产品编码*/
     private String prdtName = " ";        /* 产品名称*/
-    private Integer num = Integer.valueOf(0);        /* 数量*/
+    private BigDecimal num = new BigDecimal(0.000);         /* 数量*/
     private BigDecimal unitWt = new BigDecimal(0.000);        /* 单重*/
     private BigDecimal totalWt = new BigDecimal(0.000);        /* 总重*/
     private String filePath1 = " ";        /* 文件地址1*/
@@ -389,14 +389,14 @@ public class THPSC002 extends DaoEPBase {
      * get the num - 数量
      * @return the num
      */
-    public Integer getNum() {
+    public BigDecimal getNum() {
         return this.num;
     }
 
     /**
      * set the num - 数量
      */
-    public void setNum(Integer num) {
+    public void setNum(BigDecimal num) {
         this.num = num;
     }
 
@@ -628,7 +628,7 @@ public class THPSC002 extends DaoEPBase {
         setIcon(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("icon")), icon));
         setPrdtCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("prdtCode")), prdtCode));
         setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("prdtName")), prdtName));
-        setNum(NumberUtils.toInteger(StringUtils.toString(map.get("num")), num));
+        setNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get("num")), num));
         setUnitWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get("unitWt")), unitWt));
         setTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get("totalWt")), totalWt));
         setFilePath1(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("filePath1")), filePath1));

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

@@ -69,7 +69,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 hppz002.fromMap(map);
                 hppz002.setLeaf("1");
                 // 计算总重
-                BigDecimal num = new BigDecimal(hppz002.getNum());
+                BigDecimal num = hppz002.getNum();
                 BigDecimal unitWt = hppz002.getUnitWt();
                 DecimalFormat decimalFormat = new DecimalFormat("#.000");
                 BigDecimal totalWt = new BigDecimal(decimalFormat.format(Math.round(num.multiply(unitWt).floatValue())));
@@ -325,7 +325,7 @@ public class ServiceHPSC002 extends ServiceBase {
             HPSC004.setParentPrdtName(StringUtils.toString(domain.get("parentPrdtName")));
             HPSC004.setPrdtCode(StringUtils.toString(domain.get("prdtCode")));
             HPSC004.setPrdtName(StringUtils.toString(domain.get("prdtName")));
-            HPSC004.setNum(NumberUtils.toInteger(domain.get("num")));
+            HPSC004.setNum(NumberUtils.toBigDecimal(domain.get("num")));
             HPSC004.setUnitWt(NumberUtils.toBigDecimal(domain.get("unitWt")));
             HPSC004.setFilePath1(StringUtils.toString(domain.get("filePath1")));
             HPSC004.setFilePath2(StringUtils.toString(domain.get("filePath2")));
@@ -334,8 +334,8 @@ public class ServiceHPSC002 extends ServiceBase {
             HPSC004.setFilePath5(StringUtils.toString(domain.get("filePath5")));
             HPSC004.setPlanCommentDate("");
             HPSC004.setPlanCompletionDate("");
-            HPSC004.setActualCompletionNum(0);
-            HPSC004.setActualCompletionUnitWt(null);
+            HPSC004.setActualCompletionNum(NumberUtils.toBigDecimal(0.00));
+            HPSC004.setActualCompletionUnitWt(NumberUtils.toBigDecimal(0.00));
             HPSC004.setActualCompletionDate("");
             HPSC004.setDelStatus(1);
             HPSC004.setCreatedBy(UserSession.getUserId());

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

@@ -119,6 +119,9 @@
 		<isNotEmpty prepend=" AND " property="actualCompletionUnitWt">
 			ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="productionOrderNo">
+			PRODUCTION_ORDER_NO = #productionOrderNo#
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="status">
 			STATUS = #status#
 		</isNotEmpty>
@@ -427,18 +430,10 @@
 		CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
 		UPDATED_BY	as "updatedBy",  <!-- 更新人 -->
 		UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
-		REMARK	as "remark" <!-- 备注 -->
+		REMARK	as "remark", <!-- 备注 -->
+		PRODUCTION_ORDER_NO as productionOrderNo
 		FROM hpjx.T_HPSC004 WHERE 1=1
 		<include refid="condition" />
-		<dynamic prepend="ORDER BY">
-			<isNotEmpty property="orderBy">
-				$orderBy$
-			</isNotEmpty>
-			<isEmpty property="orderBy">
-				ID asc
-			</isEmpty>
-		</dynamic>
-
 	</select>
 
 	<select id="inspectDetail" resultClass="int">
@@ -447,4 +442,15 @@
 		OR PLAN_COMPLETION_DATE = '' OR PLAN_COMPLETION_DATE IS NULL )
 	</select>
 
+	<update id="updateRK">
+		UPDATE hpjx.T_HPSC004
+		SET
+		ACTUAL_COMPLETION_DATE	= #actualCompletionDate#,   <!-- 实际完工日期 -->
+		ACTUAL_COMPLETION_NUM	= #actualCompletionNum#,   <!-- 实际完工数量 -->
+		ACTUAL_COMPLETION_UNIT_WT	= #actualCompletionUnitWt#,   <!-- 实际完工重量 -->
+		UPDATED_BY	= #updatedBy#,   <!-- 更新人 -->
+		UPDATED_TIME	= #updatedTime#   <!-- 更新时间 -->
+		WHERE
+		ID = #id#
+	</update>
 </sqlMap>

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

@@ -3,6 +3,8 @@ $(function () {
 
 	$("#QUERY").on("click", query);
 
+	$("#GENERATE").on("click", generate);
+
 	IPLATUI.EFGrid.result = {
 		pageable: {
 			pageSize: 20,
@@ -62,7 +64,7 @@ $(window).load(function () {
 		onFail: function (ei) {
 		}
 	}, {async: false});
-	// 查询
+	// 查
 	query();
 });
 
@@ -72,3 +74,41 @@ $(window).load(function () {
 let query = function () {
 	resultGrid.dataSource.page(1);
 }
+/**
+ * 选择生产订单
+ */
+let generate = function () {
+	JSColorbox.open({
+		href: "HPKC099?methodName=initLoad",
+		title: "<div style='text-align: center;'>生产订单查询</div>",
+		width: "80%",
+		height: "80%",
+		callbackName: productionOrderQueryCallback
+	});
+}
+
+/**
+ * 生产订单回调方法
+ *
+ * @param rowDatas
+ * @param win
+ */
+let productionOrderQueryCallback = function (row) {
+	console.log(row)
+	var lists = [];// new Array();
+
+	// 增加一个元素
+	for (var i = 0; i < row.length; i++) {
+		resultGrid.dataSource.insert();
+
+		var rowsdata = resultGrid.getCheckedRows();
+		resultGrid.setCellValue(0, "productionOrderNo", row[i]["productionOrderNo"]);
+		resultGrid.setCellValue(0, "amount", row[i]["numRK"]);
+		resultGrid.setCellValue(0, "weight", row[i]["totalWtRK"]);
+		lists[i] = i;
+	}
+	resultGrid.setCheckedRows(lists);
+	// 关闭弹窗
+	JSColorbox.close();
+}
+

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

@@ -26,6 +26,7 @@
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="prodNo" cname="生产入库单号" enable="false" width="130" align="center"/>
+			<EF:EFColumn ename="productionOrderNo" cname="生产订单号" enable="false" width="130" align="center"/>
 			<EF:EFColumn ename="documentDate" cname="单据日期" width="100" align="center" editType="date"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFComboColumn cname="仓库名称" ename="whCode" columnTemplate="#=textField#"
@@ -37,9 +38,9 @@
 				<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn cname="存货名称" ename="inventCode" width="120" align="center"/>
-			<EF:EFColumn cname="数量" ename="amount" width="100" align="right" format="{0:N3}"
+			<EF:EFColumn cname="数量" ename="amount" width="100" align="right" format="{0:N3}" enable="false"
 			             sumType="all"/>
-			<EF:EFColumn cname="重量" ename="weight" width="100" align="right" format="{0:N3}"
+			<EF:EFColumn cname="重量" ename="weight" width="100" align="right" format="{0:N3}" enable="false"
 			             sumType="all"/>
 			<EF:EFColumn ename="remark" cname="备注" width="150" editType="textarea"/>
 			<EF:EFColumn cname="创建人名称" ename="createdName" enable="false" width="120" align="center"/>

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

+$(function () {
+
+    $("#QUERY").on("click", function () {
+        resultGrid.dataSource.page(1);
+    });
+
+    $("#GENERATE").on("click", generateRK);
+
+    IPLATUI.EFGrid.result = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10, 20, 50, 70, 100],
+        },
+    }
+});
+
+/**
+ * 生产入库单
+ */
+let generateRK = function () {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"取消\"操作? ", {
+        ok: function () {
+            parent.JSColorbox.setValueCallback(rows);
+        }
+    });
+}

src/main/webapp/HP/KC/HPKC099.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}"/>
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<head>
+    <%--    <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
+</head>
+<EF:EFPage title="生产订单">
+
+    <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
+
+        <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
+            <EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" row="0"/>
+            <EF:EFInput blockId="inqu_status" ename="projType" cname="生产订单号:" row="0"/>
+            <EF:EFInput blockId="inqu_status" ename="projType" cname="生产组:" row="0"/>
+        </div>
+        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>
+    </EF:EFRegion>
+
+    <EF:EFRegion id="result" title="记录集">
+
+        <EF:EFGrid blockId="result" autoDraw="no">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn enable="false" ename="projCode" cname="项目号" />
+            <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
+            <EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/>
+            <EF:EFColumn enable="false" ename="prdtCode" cname="部件编码"/>
+            <EF:EFColumn enable="false" ename="prdtName" cname="部件名称"/>
+            <EF:EFColumn enable="false" ename="planCompletionDate" cname="计划完成日期"/>
+            <EF:EFColumn ename="numRK" cname="入库数量" format="{0:N3}"/>
+            <EF:EFColumn ename="totalWtRK" cname="入库重量" format="{0:N3}"/>
+            <EF:EFColumn enable="false" ename="num" cname="计划数量"/>
+            <EF:EFColumn enable="false" ename="totalWt" cname="计划重量"/>
+            <EF:EFColumn enable="false" ename="orgName" cname="生产组"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>
+
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HP/SC/HPKC099.js"></script>
\ No newline at end of file