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

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

@@ -40,7 +40,7 @@ public class HPSC006 extends DaoEPBase {
     public static final String FIELD_TOTAL_WT = "totalWt";    		/* 计划重量*/
     public static final String FIELD_ACTUAL_COMPLETION_DATE = "actualCompletionDate";    		/* 实际完工日期*/
     public static final String FIELD_ACTUAL_COMPLETION_NUM = "actualCompletionNum";    		/* 实际完工数量*/
-    public static final String FIELD_ACTUAL_COMPLETION_UNIT_WT = "actualCompletionUnitWt";    		/* 实际完工重量*/
+    public static final String FIELD_ACTUAL_COMPLETION_TOTAL_WT = "actualCompletionTotalWt";    		/* 实际完工重量*/
     public static final String FIELD_STATUS = "status";    		/* 状态   0-计划中，1-生产中，2-已完成*/
     public static final String FIELD_ORG_NO = "orgNo";    		/* 生产组编码*/
     public static final String FIELD_ORG_NAME = "orgName";    		/* 生产组名称*/
@@ -75,7 +75,7 @@ public class HPSC006 extends DaoEPBase {
     public static final String COL_TOTAL_WT = "TOTAL_WT";    		/* 计划重量*/
     public static final String COL_ACTUAL_COMPLETION_DATE = "ACTUAL_COMPLETION_DATE";    		/* 实际完工日期*/
     public static final String COL_ACTUAL_COMPLETION_NUM = "ACTUAL_COMPLETION_NUM";    		/* 实际完工数量*/
-    public static final String COL_ACTUAL_COMPLETION_UNIT_WT = "ACTUAL_COMPLETION_UNIT_WT";    		/* 实际完工重量*/
+    public static final String COL_ACTUAL_COMPLETION_TOTAL_WT = "ACTUAL_COMPLETION_TOTAL_WT";    		/* 实际完工重量*/
     public static final String COL_STATUS = "STATUS";    		/* 状态   0-计划中，1-生产中，2-已完成*/
     public static final String COL_ORG_NO = "ORG_NO";    		/* 生产组编码*/
     public static final String COL_ORG_NAME = "ORG_NAME";    		/* 生产组名称*/
@@ -116,7 +116,7 @@ public class HPSC006 extends DaoEPBase {
     private BigDecimal totalWt = new BigDecimal(0.000);		/* 计划重量*/
     private String actualCompletionDate = " ";		/* 实际完工日期*/
     private BigDecimal actualCompletionNum = new BigDecimal("0");		/* 实际完工数量*/
-    private BigDecimal actualCompletionUnitWt = new BigDecimal(0.000);		/* 实际完工重量*/
+    private BigDecimal actualCompletionTotalWt = new BigDecimal(0.000);		/* 实际完工重量*/
     private Integer status = new Integer(0);		/* 状态   0-计划中，1-生产中，2-已完成*/
     private String orgNo = " ";		/* 生产组编码*/
     private String orgName = " ";		/* 生产组名称*/
@@ -587,20 +587,20 @@ public class HPSC006 extends DaoEPBase {
         this.actualCompletionNum = actualCompletionNum;
     }
     /**
-     * get the actualCompletionUnitWt - 实际完工重量.
-     * @return the actualCompletionUnitWt
+     * get the actualCompletionTotalWt - 实际完工重量.
+     * @return the actualCompletionTotalWt
      */
-    public BigDecimal getActualCompletionUnitWt() {
-        return this.actualCompletionUnitWt;
+    public BigDecimal getactualCompletionTotalWt() {
+        return this.actualCompletionTotalWt;
     }
 
     /**
-     * set the actualCompletionUnitWt - 实际完工重量.
+     * set the actualCompletionTotalWt - 实际完工重量.
      *
-     * @param actualCompletionUnitWt - 实际完工重量
+     * @param actualCompletionTotalWt - 实际完工重量
      */
-    public void setActualCompletionUnitWt(BigDecimal actualCompletionUnitWt) {
-        this.actualCompletionUnitWt = actualCompletionUnitWt;
+    public void setactualCompletionTotalWt(BigDecimal actualCompletionTotalWt) {
+        this.actualCompletionTotalWt = actualCompletionTotalWt;
     }
     /**
      * get the status - 状态   0-计划中，1-生产中，2-已完成.
@@ -852,7 +852,7 @@ public class HPSC006 extends DaoEPBase {
         setTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_TOTAL_WT)), totalWt));
         setActualCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_DATE)), actualCompletionDate));
         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));
+        setactualCompletionTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_TOTAL_WT)), actualCompletionTotalWt));
         setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
         setOrgNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ORG_NO)), orgNo));
         setOrgName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ORG_NAME)), orgName));
@@ -894,7 +894,7 @@ public class HPSC006 extends DaoEPBase {
         map.put(FIELD_TOTAL_WT, StringUtils.toString(totalWt, eiMetadata.getMeta(FIELD_TOTAL_WT)));
         map.put(FIELD_ACTUAL_COMPLETION_DATE, StringUtils.toString(actualCompletionDate, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_DATE)));
         map.put(FIELD_ACTUAL_COMPLETION_NUM, StringUtils.toString(actualCompletionNum, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_NUM)));
-        map.put(FIELD_ACTUAL_COMPLETION_UNIT_WT, StringUtils.toString(actualCompletionUnitWt, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_UNIT_WT)));
+        map.put(FIELD_ACTUAL_COMPLETION_TOTAL_WT, StringUtils.toString(actualCompletionTotalWt, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_TOTAL_WT)));
         map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
         map.put(FIELD_ORG_NO, StringUtils.toString(orgNo, eiMetadata.getMeta(FIELD_ORG_NO)));
         map.put(FIELD_ORG_NAME, StringUtils.toString(orgName, eiMetadata.getMeta(FIELD_ORG_NAME)));

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

@@ -24,12 +24,10 @@ public class HPSC007 extends DaoEPBase {
 
 	public static final String FIELD_ID = "id";    		
 	public static final String FIELD_COMPANY_CODE = "companyCode";    		/* 企业编码 预留*/
-	public static final String FIELD_PROJ_CODE = "projCode";    		/* 项目编码*/
-	public static final String FIELD_PROJ_NAME = "projName";    		/* 项目名称*/
 	public static final String FIELD_HPSC006_ID = "hpsc006Id";    		/* 生产下料ID*/
 	public static final String FIELD_ACTUAL_COMPLETION_DATE = "actualCompletionDate";    		/* 实际完工日期*/
 	public static final String FIELD_ACTUAL_COMPLETION_NUM = "actualCompletionNum";    		/* 实际完工数量*/
-	public static final String FIELD_ACTUAL_COMPLETION_UNIT_WT = "actualCompletionUnitWt";    		/* 实际完工重量*/
+	public static final String FIELD_ACTUAL_COMPLETION_TOTAL_WT = "actualCompletionTotalWt";    		/* 实际完工重量*/
 	public static final String FIELD_USER_ID = "userId";    		/* 完成人ID*/
 	public static final String FIELD_USER_NAME = "userName";    		/* 完成人姓名*/
 	public static final String FIELD_CREATED_BY = "createdBy";    		/* 创建人*/
@@ -41,12 +39,10 @@ public class HPSC007 extends DaoEPBase {
 
 	public static final String COL_ID = "ID";    		
 	public static final String COL_COMPANY_CODE = "COMPANY_CODE";    		/* 企业编码 预留*/
-	public static final String COL_PROJ_CODE = "PROJ_CODE";    		/* 项目编码*/
-	public static final String COL_PROJ_NAME = "PROJ_NAME";    		/* 项目名称*/
 	public static final String COL_HPSC006_ID = "HPSC006_ID";    		/* 生产下料ID*/
 	public static final String COL_ACTUAL_COMPLETION_DATE = "ACTUAL_COMPLETION_DATE";    		/* 实际完工日期*/
 	public static final String COL_ACTUAL_COMPLETION_NUM = "ACTUAL_COMPLETION_NUM";    		/* 实际完工数量*/
-	public static final String COL_ACTUAL_COMPLETION_UNIT_WT = "ACTUAL_COMPLETION_UNIT_WT";    		/* 实际完工重量*/
+	public static final String COL_ACTUAL_COMPLETION_TOTAL_WT = "ACTUAL_COMPLETION_TOTAL_WT";    		/* 实际完工重量*/
 	public static final String COL_USER_ID = "USER_ID";    		/* 完成人ID*/
 	public static final String COL_USER_NAME = "USER_NAME";    		/* 完成人姓名*/
 	public static final String COL_CREATED_BY = "CREATED_BY";    		/* 创建人*/
@@ -64,12 +60,10 @@ public class HPSC007 extends DaoEPBase {
 
 	private Long id = new Long(0);	
 	private String companyCode = " ";		/* 企业编码 预留*/
-	private String projCode = " ";		/* 项目编码*/
-	private String projName = " ";		/* 项目名称*/
-	private String hpsc006Id = " ";		/* 生产下料ID*/
+	private Long hpsc006Id = new Long(0);			/* 生产下料ID*/
 	private String actualCompletionDate = " ";		/* 实际完工日期*/
 	private BigDecimal actualCompletionNum = new BigDecimal("0");		/* 实际完工数量*/
-	private BigDecimal actualCompletionUnitWt = new BigDecimal("0");		/* 实际完工重量*/
+	private BigDecimal actualCompletionTotalWt = new BigDecimal("0");		/* 实际完工重量*/
 	private String userId = " ";		/* 完成人ID*/
 	private String userName = " ";		/* 完成人姓名*/
 	private String createdBy = " ";		/* 创建人*/
@@ -94,14 +88,6 @@ public class HPSC007 extends DaoEPBase {
 		eiColumn.setDescName("企业编码 预留");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_PROJ_CODE);
-		eiColumn.setDescName("项目编码");
-		eiMetadata.addMeta(eiColumn);
-
-		eiColumn = new EiColumn(FIELD_PROJ_NAME);
-		eiColumn.setDescName("项目名称");
-		eiMetadata.addMeta(eiColumn);
-
 		eiColumn = new EiColumn(FIELD_HPSC006_ID);
 		eiColumn.setDescName("生产下料ID");
 		eiMetadata.addMeta(eiColumn);
@@ -117,7 +103,7 @@ public class HPSC007 extends DaoEPBase {
 		eiColumn.setDescName("实际完工数量");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_ACTUAL_COMPLETION_UNIT_WT);
+		eiColumn = new EiColumn(FIELD_ACTUAL_COMPLETION_TOTAL_WT);
 		eiColumn.setType("N");
 		eiColumn.setScaleLength(3);
 		eiColumn.setFieldLength(15);
@@ -199,42 +185,10 @@ public class HPSC007 extends DaoEPBase {
 		this.companyCode = companyCode;
 	}
 	/**
-	 * get the projCode - 项目编码.
-	 * @return the projCode
-	 */
-	public String getProjCode() {
-		return this.projCode;
-	}
-
-	/**
-	 * set the projCode - 项目编码.
-	 *
-	 * @param projCode - 项目编码
-	 */
-	public void setProjCode(String projCode) {
-		this.projCode = projCode;
-	}
-	/**
-	 * get the projName - 项目名称.
-	 * @return the projName
-	 */
-	public String getProjName() {
-		return this.projName;
-	}
-
-	/**
-	 * set the projName - 项目名称.
-	 *
-	 * @param projName - 项目名称
-	 */
-	public void setProjName(String projName) {
-		this.projName = projName;
-	}
-	/**
 	 * get the hpsc006Id - 生产下料ID.
 	 * @return the hpsc006Id
 	 */
-	public String getHpsc006Id() {
+	public Long getHpsc006Id() {
 		return this.hpsc006Id;
 	}
 
@@ -243,7 +197,7 @@ public class HPSC007 extends DaoEPBase {
 	 *
 	 * @param hpsc006Id - 生产下料ID
 	 */
-	public void setHpsc006Id(String hpsc006Id) {
+	public void setHpsc006Id(Long hpsc006Id) {
 		this.hpsc006Id = hpsc006Id;
 	}
 	/**
@@ -279,20 +233,20 @@ public class HPSC007 extends DaoEPBase {
 		this.actualCompletionNum = actualCompletionNum;
 	}
 	/**
-	 * get the actualCompletionUnitWt - 实际完工重量.
-	 * @return the actualCompletionUnitWt
+	 * get the actualCompletionTotalWt - 实际完工重量.
+	 * @return the actualCompletionTotalWt
 	 */
-	public BigDecimal getActualCompletionUnitWt() {
-		return this.actualCompletionUnitWt;
+	public BigDecimal getactualCompletionTotalWt() {
+		return this.actualCompletionTotalWt;
 	}
 
 	/**
-	 * set the actualCompletionUnitWt - 实际完工重量.
+	 * set the actualCompletionTotalWt - 实际完工重量.
 	 *
-	 * @param actualCompletionUnitWt - 实际完工重量
+	 * @param actualCompletionTotalWt - 实际完工重量
 	 */
-	public void setActualCompletionUnitWt(BigDecimal actualCompletionUnitWt) {
-		this.actualCompletionUnitWt = actualCompletionUnitWt;
+	public void setactualCompletionTotalWt(BigDecimal actualCompletionTotalWt) {
+		this.actualCompletionTotalWt = actualCompletionTotalWt;
 	}
 	/**
 	 * get the userId - 完成人ID.
@@ -432,12 +386,10 @@ public class HPSC007 extends DaoEPBase {
 
 		setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
 		setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
-		setProjCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_CODE)), projCode));
-		setProjName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROJ_NAME)), projName));
-		setHpsc006Id(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_HPSC006_ID)), hpsc006Id));
+		setHpsc006Id(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_HPSC006_ID)), hpsc006Id));
 		setActualCompletionDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_DATE)), actualCompletionDate));
 		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));
+		setactualCompletionTotalWt(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_ACTUAL_COMPLETION_TOTAL_WT)), actualCompletionTotalWt));
 		setUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_USER_ID)), userId));
 		setUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_USER_NAME)), userName));
 		setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
@@ -457,12 +409,10 @@ public class HPSC007 extends DaoEPBase {
 		Map map = new HashMap();
 		map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
 		map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
-		map.put(FIELD_PROJ_CODE, StringUtils.toString(projCode, eiMetadata.getMeta(FIELD_PROJ_CODE)));
-		map.put(FIELD_PROJ_NAME, StringUtils.toString(projName, eiMetadata.getMeta(FIELD_PROJ_NAME)));
 		map.put(FIELD_HPSC006_ID, StringUtils.toString(hpsc006Id, eiMetadata.getMeta(FIELD_HPSC006_ID)));
 		map.put(FIELD_ACTUAL_COMPLETION_DATE, StringUtils.toString(actualCompletionDate, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_DATE)));
 		map.put(FIELD_ACTUAL_COMPLETION_NUM, StringUtils.toString(actualCompletionNum, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_NUM)));
-		map.put(FIELD_ACTUAL_COMPLETION_UNIT_WT, StringUtils.toString(actualCompletionUnitWt, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_UNIT_WT)));
+		map.put(FIELD_ACTUAL_COMPLETION_TOTAL_WT, StringUtils.toString(actualCompletionTotalWt, eiMetadata.getMeta(FIELD_ACTUAL_COMPLETION_TOTAL_WT)));
 		map.put(FIELD_USER_ID, StringUtils.toString(userId, eiMetadata.getMeta(FIELD_USER_ID)));
 		map.put(FIELD_USER_NAME, StringUtils.toString(userName, eiMetadata.getMeta(FIELD_USER_NAME)));
 		map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));

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

@@ -118,7 +118,7 @@ public class ServiceHPSC001 extends ServiceBase {
             for (int i = 0; i < eiBlock.getRowCount(); i++) {
                 Map<?, ?> map = eiBlock.getRow(i);
                 hpsc001.fromMap(map);
-                this.dao.delete("HPPZ001.delete", hpsc001.toMap());
+                this.dao.delete("HPSC001.delete", hpsc001.toMap());
 
             }
         } catch (PlatException e) {

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

+package com.baosight.hpjx.hp.sc.service;
+
+import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.security.UserSessionUtils;
+import com.baosight.hpjx.hp.constant.HPConstant;
+import com.baosight.hpjx.hp.sc.domain.HPSC007;
+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;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+import com.baosight.iplat4j.core.service.soa.XLocalManager;
+import com.baosight.iplat4j.ed.util.SequenceGenerator;
+
+import java.util.*;
+
+/**
+ *
+ */
+public class ServiceHPSC007 extends ServiceBase {
+
+
+    /**
+     * 画面初始化.
+     */
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            inInfo = super.query(inInfo, "HPSC007.query", new HPSC007());
+            Map map = new HashMap();
+            map.put("companyCode", UserSessionUtils.getCompanyCode());
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map,true);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+
+    /**
+     * 查询操作.
+     */
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        /* 调用EI查询方法.*/
+        EiInfo outInfo = super.query(inInfo, "HPSC007.query", new HPSC007());
+        return outInfo;
+
+    }
+
+    /**
+     * 新增操作.
+     */
+    @Override
+    public EiInfo insert(EiInfo inInfo) {
+        try {
+            HPSC007 HPSC007 = new HPSC007();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (int i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                HPSC007.fromMap(map);
+                DaoUtils.insert("HPSC007.insert",HPSC007);
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsg("新增成功！");
+
+        } catch (PlatException e) {
+            e.printStackTrace();
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            inInfo.setMsg("新增失败！原因参见详细错误描述！");
+            inInfo.setDetailMsg(e.getMessage());
+            logError("新增失败", e.getMessage());
+            return inInfo;
+        }
+        return query(inInfo);
+    }
+
+    /**
+     * 修改操作.
+     */
+    public EiInfo update(EiInfo inInfo) {
+        try {
+            HPSC007 HPSC007 = new HPSC007();
+            EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
+            for (int i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                HPSC007.fromMap(map);
+                DaoUtils.update("HPSC007.update",HPSC007);
+            }
+            inInfo.setStatus(EiConstant.STATUS_SUCCESS);
+            inInfo.setMsg("修改成功！");
+        } catch (PlatException e) {
+            inInfo.setStatus(EiConstant.STATUS_FAILURE);
+            inInfo.setMsg("操作失败！原因参见详细错误描述！");
+            inInfo.setDetailMsg(e.getMessage());
+            logError("修改失败", e.getMessage());
+            return inInfo;
+        }
+        return query(inInfo);
+    }
+
+    /**
+     * 删除操作.
+     */
+    public EiInfo delete(EiInfo eiInfo) {
+        HPSC007 HPSC007 = new HPSC007();
+        EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
+        try {
+            for (int i = 0; i < eiBlock.getRowCount(); i++) {
+                Map<?, ?> map = eiBlock.getRow(i);
+                HPSC007.fromMap(map);
+                this.dao.delete("HPSC007.delete", HPSC007.toMap());
+
+            }
+        } catch (PlatException e) {
+            eiInfo.setStatus(EiConstant.STATUS_FAILURE);
+            eiInfo.setMsg("删除失败，原因参见详细错误描述！");
+            eiInfo.setDetailMsg(e.getMessage());
+            logError("删除失败！", e.getMessage());
+            return eiInfo;
+        }
+
+        eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
+        eiInfo.setMsg("删除成功！");
+        return eiInfo;
+    }
+}

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

@@ -57,7 +57,7 @@
 		TOTAL_WT	as "totalWt",  <!-- 计划重量 -->
 		ACTUAL_COMPLETION_DATE	as "actualCompletionDate",  <!-- 实际完工日期 -->
 		ACTUAL_COMPLETION_NUM	as "actualCompletionNum",  <!-- 实际完工数量 -->
-		ACTUAL_COMPLETION_UNIT_WT	as "actualCompletionUnitWt",
+		ACTUAL_COMPLETION_TOTAL_WT	as "actualCompletionTotalWt",
 		STATUS	as "status",  <!-- 状态   0-计划中，1-生产中，2-已完成 -->
 		ORG_NO	as "orgNo",  <!-- 生产组编码 -->
 		ORG_NAME	as "orgName",  <!-- 生产组名称 -->
@@ -226,7 +226,7 @@
 		TOTAL_WT,  <!-- 计划重量 -->
 		ACTUAL_COMPLETION_DATE,  <!-- 实际完工日期 -->
 		ACTUAL_COMPLETION_NUM,  <!-- 实际完工数量 -->
-		ACTUAL_COMPLETION_UNIT_WT,
+		ACTUAL_COMPLETION_TOTAL_WT,
 		STATUS,  <!-- 状态   0-计划中，1-生产中，2-已完成 -->
 		ORG_NO,  <!-- 生产组编码 -->
 		ORG_NAME,  <!-- 生产组名称 -->
@@ -243,7 +243,7 @@
 		)
 		VALUES (#companyCode#, #projCode#, #projName#, #productionOrderNo#, #inventType#, #inventCode#,
 		        #inventName#, #inventLength#, #inventWidth#, #inventThick#, #inventSpec#, #material#, #planCompletionDate#,
-		        #num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#,#status#, #orgNo#,
+		        #num#, #unitWt#, #totalWt#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionTotalWt#,#status#, #orgNo#,
 		        #orgName#, #factoryCode#, #factoryName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#,
 		        #depCode#, #remark#, #filePath1#, #inventRecordId#)
 	</insert>
@@ -274,7 +274,7 @@
 		TOTAL_WT	= #totalWt#,   <!-- 计划重量 -->
 		ACTUAL_COMPLETION_DATE	= #actualCompletionDate#,   <!-- 实际完工日期 -->
 		ACTUAL_COMPLETION_NUM	= #actualCompletionNum#,   <!-- 实际完工数量 -->
-		ACTUAL_COMPLETION_UNIT_WT	= #actualCompletionUnitWt#,
+		ACTUAL_COMPLETION_TOTAL_WT	= #actualCompletionTotalWt#,
 		STATUS	= #status#,   <!-- 状态   0-计划中，1-生产中，2-已完成 -->
 		ORG_NO	= #orgNo#,   <!-- 生产组编码 -->
 		ORG_NAME	= #orgName#,   <!-- 生产组名称 -->

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

@@ -6,12 +6,10 @@
 		tableName : T_HPSC007
 		 ID  BIGINT   NOT NULL   primarykey, 
 		 COMPANY_CODE  VARCHAR, 
-		 PROJ_CODE  VARCHAR, 
-		 PROJ_NAME  VARCHAR, 
 		 HPSC006_ID  VARCHAR,
 		 ACTUAL_COMPLETION_DATE  VARCHAR, 
 		 ACTUAL_COMPLETION_NUM  DECIMAL, 
-		 ACTUAL_COMPLETION_UNIT_WT  DECIMAL, 
+		 ACTUAL_COMPLETION_TOTAL_WT  DECIMAL, 
 		 USER_ID  VARCHAR, 
 		 USER_NAME  VARCHAR, 
 		 CREATED_BY  VARCHAR, 
@@ -30,12 +28,6 @@
 		<isNotEmpty prepend=" AND " property="companyCode">
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME = #projName#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="hpsc006Id">
 			HPSC006_ID = #hpsc006Id#
 		</isNotEmpty>
@@ -45,8 +37,8 @@
 		<isNotEmpty prepend=" AND " property="actualCompletionNum">
 			ACTUAL_COMPLETION_NUM = #actualCompletionNum#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="actualCompletionUnitWt">
-			ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#
+		<isNotEmpty prepend=" AND " property="actualCompletionTotalWt">
+			ACTUAL_COMPLETION_TOTAL_WT = #actualCompletionTotalWt#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="userId">
 			USER_ID = #userId#
@@ -79,12 +71,10 @@
 		SELECT
 				ID	as "id",  
 				COMPANY_CODE	as "companyCode",  <!-- 企业编码 预留 -->
-				PROJ_CODE	as "projCode",  <!-- 项目编码 -->
-				PROJ_NAME	as "projName",  <!-- 项目名称 -->
 				HPSC006_ID	as "hpsc006Id",  <!-- 生产下料ID -->
 				ACTUAL_COMPLETION_DATE	as "actualCompletionDate",  <!-- 实际完工日期 -->
 				ACTUAL_COMPLETION_NUM	as "actualCompletionNum",  <!-- 实际完工数量 -->
-				ACTUAL_COMPLETION_UNIT_WT	as "actualCompletionUnitWt",  <!-- 实际完工重量 -->
+				ACTUAL_COMPLETION_TOTAL_WT	as "actualCompletionTotalWt",  <!-- 实际完工重量 -->
 				USER_ID	as "userId",  <!-- 完成人ID -->
 				USER_NAME	as "userName",  <!-- 完成人姓名 -->
 				CREATED_BY	as "createdBy",  <!-- 创建人 -->
@@ -133,8 +123,8 @@
 		<isNotEmpty prepend=" AND " property="actualCompletionNum">
 			ACTUAL_COMPLETION_NUM = #actualCompletionNum#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="actualCompletionUnitWt">
-			ACTUAL_COMPLETION_UNIT_WT = #actualCompletionUnitWt#
+		<isNotEmpty prepend=" AND " property="actualCompletionTotalWt">
+			ACTUAL_COMPLETION_TOTAL_WT = #actualCompletionTotalWt#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="userId">
 			USER_ID = #userId#
@@ -165,12 +155,10 @@
 	<insert id="insert">
 		INSERT INTO ${hpjxSchema}.T_HPSC007 (ID,
 										COMPANY_CODE,  <!-- 企业编码 预留 -->
-										PROJ_CODE,  <!-- 项目编码 -->
-										PROJ_NAME,  <!-- 项目名称 -->
 										HPSC006_ID,  <!-- 生产下料ID -->
 										ACTUAL_COMPLETION_DATE,  <!-- 实际完工日期 -->
 										ACTUAL_COMPLETION_NUM,  <!-- 实际完工数量 -->
-										ACTUAL_COMPLETION_UNIT_WT,  <!-- 实际完工重量 -->
+										ACTUAL_COMPLETION_TOTAL_WT,  <!-- 实际完工重量 -->
 										USER_ID,  <!-- 完成人ID -->
 										USER_NAME,  <!-- 完成人姓名 -->
 										CREATED_BY,  <!-- 创建人 -->
@@ -180,7 +168,7 @@
 										DEP_CODE,  <!-- 部门编码 -->
 										REMARK  <!-- 备注 -->
 										)
-	    VALUES (#id#, #companyCode#, #projCode#, #projName#, #hpsc006Id#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionUnitWt#, #userId#, #userName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
+	    VALUES (#id#, #companyCode#, #hpsc006Id#, #actualCompletionDate#, #actualCompletionNum#, #actualCompletionTotalWt#, #userId#, #userName#, #createdBy#, #createdTime#, #updatedBy#, #updatedTime#, #depCode#, #remark#)
 	</insert>
 
 	<delete id="delete">
@@ -192,12 +180,10 @@
 		UPDATE ${hpjxSchema}.T_HPSC007
 		SET
 					COMPANY_CODE	= #companyCode#,   <!-- 企业编码 预留 -->
-					PROJ_CODE	= #projCode#,   <!-- 项目编码 -->
-					PROJ_NAME	= #projName#,   <!-- 项目名称 -->
 					HPSC006_ID	= #hpsc006Id#,   <!-- 生产下料ID -->
 					ACTUAL_COMPLETION_DATE	= #actualCompletionDate#,   <!-- 实际完工日期 -->
 					ACTUAL_COMPLETION_NUM	= #actualCompletionNum#,   <!-- 实际完工数量 -->
-					ACTUAL_COMPLETION_UNIT_WT	= #actualCompletionUnitWt#,   <!-- 实际完工重量 -->
+					ACTUAL_COMPLETION_TOTAL_WT	= #actualCompletionTotalWt#,   <!-- 实际完工重量 -->
 					USER_ID	= #userId#,   <!-- 完成人ID -->
 					USER_NAME	= #userName#,   <!-- 完成人姓名 -->
 					CREATED_BY	= #createdBy#,   <!-- 创建人 -->

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

+$(function () {
+
+    IPLATUI.EFGrid = {
+        "result" : {
+	        pageable: {
+		        pageSize: 20,
+		        pageSizes: [10, 20, 50, 70, 100],
+	        },
+	        columns: [{
+		        field: "factoryName",
+		        attributes: {
+			        class: "i-input-readonly"
+		        }
+	        }],
+	        onSave: function (e) {
+		        // 阻止后台保存请求，使用自定义保存
+		        e.preventDefault();
+		        save();
+	        },
+	        onDelete: function (e) {
+		        // 阻止后台删除请求，使用自定义删除
+		        e.preventDefault();
+		        deleteFunc();
+	        }
+        }
+    }
+
+	$("#QUERY").on("click", query);
+
+});
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+	// 查询
+	query();
+});
+
+/**
+ * 查询
+ */
+function query() {
+	resultGrid.dataSource.page(1);
+}
+
+/**
+ * 保存
+ */
+let save = function () {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据");
+		return;
+	}
+	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HPSC005A", "save", true);
+		}
+	});
+}
+
+/**
+ * 删除
+ */
+let deleteFunc = function () {
+	let rows = resultGrid.getCheckedRows();
+	if (rows.length < 1) {
+		message("请选择数据");
+		return;
+	}
+	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作? ", {
+		ok: function () {
+			JSUtils.submitGridsData("result", "HPSC005A", "delete", true);
+		}
+	});
+}

src/main/webapp/HP/SC/HPSC007.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="订单详情">
+		<div class="row">
+			<EF:EFInput ename="detail-0-projCode" cname="项目号" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-projName" cname="项目名称" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput ename="detail-0-prdtName" cname="部件名称" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-partName" cname="零部件名称" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput ename="detail-0-inventName" cname="材料名称" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-num" cname="计划数量" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput ename="detail-0-unitWt" cname="单重" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-totalWt" cname="计划重量" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput ename="detail-0-actualCompletionNum" cname="完工数量" colWidth="4" readonly="true"/>
+			<EF:EFInput ename="detail-0-actualCompletionUnitWt" cname="完工重量" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput ename="detail-0-planCompletionDate" cname="计划完成日期" colWidth="4" readonly="true"/>
+			<EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true">
+				<EF:EFOption label="下料中" value="0"/>
+				<EF:EFOption label="完工" value="1"/>
+			</EF:EFSelect>
+		</div>
+	</EF:EFRegion>
+
+	<EF:EFRegion id="result" title="明细信息">
+		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
+			<EF:EFColumn ename="actualCompletionDate" cname="完成日期" enable="false" hidden="true"/>
+			<EF:EFColumn ename="userId" cname="完成人" enable="false" align="center"/>
+			<EF:EFColumn ename="actualCompletionNum" cname="完成数量" format="{0:N3}" />
+			<EF:EFColumn ename="totalWt" cname="分派重量" enable="false" format="{0:N3}"/>
+		</EF:EFGrid>
+	</EF:EFRegion>
+</EF:EFPage>