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

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

@@ -229,7 +229,7 @@ public class ServiceHPKC001 extends ServiceBase {
 			// 入库单号
 			List<String> otherEnterNos = ObjectUtils.listKey(resultRows, "otherEnterNo");
 			// 锁记录
-			HPKCTools.HpKc001.lock(otherEnterNos);
+			HPKCTools.HpKc001. lock(otherEnterNos);
 			// 查询数据库记录
 			Map<String, HPKC001> mapKc001 = HPKCTools.HpKc001.map(otherEnterNos);
 			// 删除数据

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

@@ -50,7 +50,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "生产入库单-生产任务查询-初始化")
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {

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

@@ -117,7 +117,6 @@ public class ServiceHPKC005 extends ServiceBase {
 	 *
 	 * @param fKc005
 	 */
-	@OperationLogAnnotation(operModul = "库存盘点单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPKC005 fKc005) {
 		// 去除日期字符串中的-
 		fKc005.setReceiptDate(StringUtil.removeHorizontalLine(fKc005.getReceiptDate()));

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

@@ -146,7 +146,6 @@ public class ServiceHPKC006 extends ServiceBase {
 	 *
 	 * @param resultRows
 	 */
-	@OperationLogAnnotation(operModul = "其他入库单",operType = "校验",operDesc = "校验保存的数据")
 	private void checkSaveData(List<Map> resultRows) {
 		for (int i = 0; i < resultRows.size(); i++) {
 			HPKC006 fKc006 = new HPKC006();
@@ -164,7 +163,6 @@ public class ServiceHPKC006 extends ServiceBase {
 	 *
 	 * @param fKc006
 	 */
-	@OperationLogAnnotation(operModul = "其他入库单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPKC006 fKc006) {
 		// 去除日期字符串中的-
 		fKc006.setReceiptDate(StringUtil.removeHorizontalLine(fKc006.getReceiptDate()));

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

@@ -167,7 +167,6 @@ public class ServiceHPKC007 extends ServiceBase {
 	 *
 	 * @param resultRows
 	 */
-	@OperationLogAnnotation(operModul = "其他出库单",operType = "校验",operDesc = "校验保存的数据")
 	private void checkSaveData(List<Map> resultRows) {
 		for (int i = 0; i < resultRows.size(); i++) {
 			HPKC007 fKc007 = new HPKC007();
@@ -185,7 +184,6 @@ public class ServiceHPKC007 extends ServiceBase {
 	 *
 	 * @param fKc007
 	 */
-	@OperationLogAnnotation(operModul = "其他出库单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPKC007 fKc007) {
 		// 去除日期字符串中的-
 		fKc007.setReceiptDate(StringUtil.removeHorizontalLine(fKc007.getReceiptDate()));

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

@@ -164,7 +164,6 @@ public class ServiceHPKC009A extends ServiceBase {
 	 *
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "统计库存收发存")
 	private List<HPKC009A> statData(Map queryMap) {
 		List<HPKC009A> newKc009As = new ArrayList<>();
 		// 1.1、期末库存
@@ -236,7 +235,6 @@ public class ServiceHPKC009A extends ServiceBase {
 	 *
 	 * @param kc009as
 	 */
-	@OperationLogAnnotation(operModul = "库存管理",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(List<HPKC009A> kc009as) {
 		// 仓库名称
 		List<String> whCodes = kc009as.stream().map(HPKC009A::getWhCode).collect(Collectors.toList());
@@ -285,7 +283,6 @@ public class ServiceHPKC009A extends ServiceBase {
 	 * @param subInventCode
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存管理",operType = "设置",operDesc = "构建KEY")
 	private String buildKey(Object companyCode, Object depCode, Object whCode, Object projCode, Object inventCode,
 			Object subInventCode) {
 		return ObjectUtils.trimToEmpty(companyCode) + "#"

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

@@ -182,8 +182,7 @@ public class ServiceHPKC010 extends ServiceBase {
 		hpkc010.setUpdatedTime(time);
 		return hpkc010;
 	}
-	
-	@OperationLogAnnotation(operModul = "实时库存管理",operType = "设置",operDesc = "生成库存对象")
+
 	private void generatorBaseInfo(HPKC010 hpkc010) {
 		String whName = "";
 		Integer inventType = new Integer(0);
@@ -232,7 +231,6 @@ public class ServiceHPKC010 extends ServiceBase {
 	 * @param amout
 	 * @param weight
 	 */
-	@OperationLogAnnotation(operModul = "实时库存管理",operType = "校验",operDesc = "校验库存变更请求参数")
 	private void checkUpdateStockParam(String companyCode, String whCode, Long inventRecordId
 			, BigDecimal amout, BigDecimal weight){
 		if(StringUtils.isBlank(companyCode)){

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

@@ -171,7 +171,7 @@ public class ServiceHPKC011 extends ServiceBase {
 		hpkc011.setUpdatedTime(time);
 		return hpkc011;
 	}
-	@OperationLogAnnotation(operModul = "产品库存管理",operType = "设置",operDesc = "生成库存对象")
+
 	private void generatorBaseInfo(HPKC011 hpkc011) {
 		EiInfo inInfo = new EiInfo();
 		try {
@@ -214,7 +214,6 @@ public class ServiceHPKC011 extends ServiceBase {
 	 * @param amout
 	 * @param weight
 	 */
-	@OperationLogAnnotation(operModul = "产品库存管理",operType = "校验",operDesc = "校验库存变更请求参数")
 	private void checkUpdateStockParam(String companyCode, String whCode, String prodNo
 			, BigDecimal amout, BigDecimal weight){
 		if(StringUtils.isBlank(companyCode)){

src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT001.java

+package com.baosight.hpjx.hp.mt.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.constant.HPSqlConstant;
+import com.baosight.hpjx.hp.zl.domain.HPZL001;
+import com.baosight.hpjx.util.AssertUtils;
+import com.baosight.hpjx.util.EiInfoUtils;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.hpjx.util.StringUtil;
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鸿鹏机械APP移动端接口调用处
+ */
+public class ServiceHPMT001 extends ServiceBase {
+
+    /**
+     * 画面初始化
+     *
+     * @param inInfo
+     * @return
+     */
+    public EiInfo initLoad(EiInfo inInfo) {
+        return inInfo;
+    }
+
+
+    /**
+     * 生产管理-整体概览
+     *
+     * @param inInfo
+     * @return
+     */
+    public EiInfo pmOverview(EiInfo inInfo) {
+        Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+        String queryMonth = MapUtils.getString(queryMap, "queryMonth");
+        String companyCode = UserSessionUtils.getCompanyCode();
+        if (StrUtil.isEmpty(companyCode)) {
+            inInfo.setMsg("账号异常");
+        }
+        Map sqlMap = new HashMap();
+        sqlMap.put("queryMonth", queryMonth);
+        sqlMap.put("companyCode", companyCode);
+        List<Map> row1 = this.dao.query("HPMT001.pmOverview1", sqlMap);
+        List<Map> row2 = this.dao.query("HPMT001.pmOverview2", sqlMap);
+        List<Map> rows = new ArrayList<>();
+        Map resultMap = new HashMap();
+        if (BeanUtil.isEmpty(row1.get(0))) {
+            resultMap.put("targetWt", 0);
+        } else {
+            resultMap.put("targetWt", row1.get(0).get("targetWt"));
+        }
+        if (BeanUtil.isEmpty(row2.get(0))) {
+            resultMap.put("actualWt", 0);
+        } else {
+            resultMap.put("actualWt", row2.get(0).get("actualWt"));
+        }
+        rows.add(resultMap);
+        EiInfo outInfo = new EiInfo();
+        EiBlock eiBlock = new EiBlock(EiConstant.resultBlock);
+        eiBlock.setRows(rows);
+        outInfo.setBlock(eiBlock);
+        return outInfo;
+    }
+
+    /**
+     * 生产管理-基地对标
+     *
+     * @param inInfo
+     * @return
+     */
+    public EiInfo pmBenchmarking(EiInfo inInfo) {
+        Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+        String queryMonth = MapUtils.getString(queryMap, "queryMonth");
+        String companyCode = UserSessionUtils.getCompanyCode();
+        if (StrUtil.isEmpty(companyCode)) {
+            inInfo.setMsg("账号异常");
+        }
+        Map sqlMap = new HashMap();
+        sqlMap.put("queryMonth", queryMonth);
+        sqlMap.put("companyCode", companyCode);
+        List<Map> rows = this.dao.query("HPMT001.pmBenchmarking", sqlMap);
+        EiInfo outInfo = new EiInfo();
+        EiBlock eiBlock = new EiBlock(EiConstant.resultBlock);
+        eiBlock.setRows(rows);
+        outInfo.setBlock(eiBlock);
+        return outInfo;
+    }
+
+}

src/main/java/com/baosight/hpjx/hp/mt/sql/HPMT001.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<sqlMap namespace="HPMT001">
+
+	<select id="pmOverview1" resultClass="java.util.HashMap">
+        SELECT
+            CAST(SUM(NUM*UNIT_WT) AS DECIMAL(15,3)) AS targetWt
+        FROM
+            hpjx.t_hpsc004
+        WHERE
+            PROJ_CODE IN
+            (
+            SELECT
+                PROJ_CODE
+            FROM
+                (
+                SELECT
+                    COMPANY_CODE,
+                    PROJ_CODE,
+                    REPLACE(PLAN_COMPLETION_DATE,'/','') AS PLAN_COMPLETION_DATE
+                FROM
+                    hpjx.t_hpsc003
+                WHERE
+                    LENGTH(PLAN_COMPLETION_DATE) > 6
+            ) AS T
+            WHERE
+            SUBSTR(PLAN_COMPLETION_DATE,1,6) = #queryMonth#
+            AND COMPANY_CODE = #companyCode#
+        )
+	</select>
+    <select id="pmOverview2" resultClass="java.util.HashMap">
+        SELECT
+            CAST(SUM(AMOUNT*WEIGHT) AS DECIMAL(15,3)) AS actualWt
+        FROM
+            hpjx.t_hpkc003
+        WHERE
+            SUBSTR(DOCUMENT_DATE,1,6) = #queryMonth#
+        AND COMPANY_CODE = #companyCode#
+    </select>
+
+
+
+    <select id="pmBenchmarking" resultClass="java.util.HashMap">
+        SELECT
+        T1.DOCUMENT_DATE,
+        T1.FACTORY_NAME,
+        SUM(T1.ACTUAL_TOTAL_AMOUNT) AS ACTUAL_TOTAL_AMOUNT,
+        SUM(T1.ACTUAL_TOTAL_WT)     AS ACTUAL_TOTAL_WT,
+        SUM(T2.TARGET_TOTAL_WT)     AS TARGET_TOTAL_WT
+        FROM
+        (
+        SELECT
+        SUBSTR(T1.DOCUMENT_DATE,1,6) AS DOCUMENT_DATE,
+        T1.PROJ_CODE,
+        T1.PROJ_NAME,
+        T2.FACTORY_NAME,
+        SUM(T1.AMOUNT) AS ACTUAL_TOTAL_AMOUNT,
+        SUM(T1.WEIGHT) AS ACTUAL_TOTAL_WT
+        FROM
+        hpjx.t_hpkc003 AS T1
+        LEFT JOIN
+        (
+        SELECT
+        PROD_ORDER_NO,
+        FACTORY_NAME
+        FROM
+        hpjx.t_hpsc005a
+        WHERE
+        COMPANY_CODE =  #companyCode#
+        GROUP BY
+        PROD_ORDER_NO) AS T2
+        ON
+        T1.PROD_ORDER_NO = T2.PROD_ORDER_NO
+        WHERE
+        SUBSTR(T1.DOCUMENT_DATE,1,6) = #queryMonth#
+        GROUP BY
+        T1.PROJ_CODE ) AS T1
+        LEFT JOIN
+        (
+        SELECT
+        PROJ_CODE,
+        CAST(SUM(NUM*UNIT_WT) AS DECIMAL(15,3)) AS TARGET_TOTAL_WT
+        FROM
+        hpjx.t_hpsc004
+        WHERE
+        PROJ_CODE IN
+        (
+        SELECT
+        PROJ_CODE
+        FROM
+        (
+        SELECT
+        COMPANY_CODE,
+        PROJ_CODE,
+        REPLACE(PLAN_COMPLETION_DATE,'/','') AS PLAN_COMPLETION_DATE
+        FROM
+        hpjx.t_hpsc003
+        WHERE
+        LENGTH(PLAN_COMPLETION_DATE) > 6) AS T
+        WHERE
+        SUBSTR(PLAN_COMPLETION_DATE,1,6) = #queryMonth#
+        AND COMPANY_CODE =  #companyCode#)
+        GROUP BY
+        PROJ_CODE ) AS T2
+        ON
+        T1.PROJ_CODE = T2.PROJ_CODE
+        GROUP BY
+        T1.FACTORY_NAME
+    </select>
+</sqlMap>

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ009.java

@@ -99,7 +99,6 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 *
 	 * @param resultRows
 	 */
-	@OperationLogAnnotation(operModul = "企业管理",operType = "校验",operDesc = "校验保存的数据")
 	private void checkSaveData(List<Map> resultRows) {
 		// 数据校验
 		for (int i = 0; i < resultRows.size(); i++) {
@@ -117,7 +116,6 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 * @param fPz009
 	 * @throws Exception
 	 */
-	@OperationLogAnnotation(operModul = "企业管理",operType = "新增",operDesc = "新增企业信息")
 	private void add(HPPZ009 fPz009) throws Exception {
 		// 生成企业编码
 		fPz009.setCompanyCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.COMPANY_CODE));
@@ -134,7 +132,6 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 *
 	 * @param fPz009
 	 */
-	@OperationLogAnnotation(operModul = "企业管理",operType = "修改",operDesc = "修改")
 	private void modify(HPPZ009 fPz009) {
 		DaoUtils.update("HPPZ009.update", fPz009);
 	}
@@ -172,7 +169,6 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 *
 	 * @param hppz009
 	 */
-	@OperationLogAnnotation(operModul = "企业管理",operType = "新增",operDesc = "初始化用户")
 	private void initUser(HPPZ009 hppz009) throws Exception {
 		String companyCode = hppz009.getCompanyCode();
 		Map inInfoRowMap = new HashMap();
@@ -201,7 +197,6 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 *
 	 * @param hppz009
 	 */
-	@OperationLogAnnotation(operModul = "企业管理",operType = "新增",operDesc = "用户关联角色")
 	private void insertGroupMember(HPPZ009 hppz009) {
 		String companyCode = hppz009.getCompanyCode();
 		Map inInfoRowMap = new HashMap();

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ010.java

@@ -99,7 +99,6 @@ public class ServiceHPPZ010 extends ServiceBase {
 	 *
 	 * @param resultRows
 	 */
-	@OperationLogAnnotation(operModul = "配置管理",operType = "校验",operDesc = "校验保存的数据")
 	private void checkSaveData(List<Map> resultRows) {
 		// 数据校验
 		for (int i = 0; i < resultRows.size(); i++) {
@@ -116,7 +115,6 @@ public class ServiceHPPZ010 extends ServiceBase {
 	 * @param fPz009
 	 * @throws Exception
 	 */
-	@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "新增企业信息")
 	private void add(HPPZ009 fPz009) throws Exception {
 		// 生成企业编码
 		fPz009.setCompanyCode(SequenceGenerator.getNextSequence("COMPANY_CODE"));
@@ -133,7 +131,6 @@ public class ServiceHPPZ010 extends ServiceBase {
 	 *
 	 * @param fPz009
 	 */
-	@OperationLogAnnotation(operModul = "配置管理",operType = "修改",operDesc = "修改数据")
 	private void modify(HPPZ009 fPz009) {
 		DaoUtils.update("HPPZ009.update", fPz009);
 	}
@@ -171,7 +168,6 @@ public class ServiceHPPZ010 extends ServiceBase {
 	 *
 	 * @param hppz009
 	 */
-	@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "初始化用户")
 	private void initUser(HPPZ009 hppz009) throws Exception {
 		String companyCode = hppz009.getCompanyCode();
 		Map inInfoRowMap = new HashMap();
@@ -200,7 +196,6 @@ public class ServiceHPPZ010 extends ServiceBase {
 	 *
 	 * @param hppz009
 	 */
-	@OperationLogAnnotation(operModul = "配置管理",operType = "查询",operDesc = "用户关联角色")
 	private void insertGroupMember(HPPZ009 hppz009) {
 		String companyCode = hppz009.getCompanyCode();
 		Map inInfoRowMap = new HashMap();

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ011.java

@@ -116,7 +116,6 @@ public class ServiceHPPZ011 extends ServiceBase {
 	 *
 	 * @param resultRows
 	 */
-	@OperationLogAnnotation(operModul = "厂区管理",operType = "校验",operDesc = "校验保存的数据")
 	private void checkSaveData(List<Map> resultRows) {
 		// 数据校验
 		for (int i = 0; i < resultRows.size(); i++) {
@@ -132,7 +131,6 @@ public class ServiceHPPZ011 extends ServiceBase {
 	 *
 	 * @param fPz011
 	 */
-	@OperationLogAnnotation(operModul = "厂区管理",operType = "新增",operDesc = "新增企业信息")
 	private void add(HPPZ011 fPz011) {
 		fPz011.setDeleteFlag(CommonConstant.YesNo.NO_0);
 		DaoUtils.insert(HPPZ011.INSERT, fPz011);
@@ -143,7 +141,6 @@ public class ServiceHPPZ011 extends ServiceBase {
 	 *
 	 * @param fPz011
 	 */
-	@OperationLogAnnotation(operModul = "厂区管理",operType = "修改",operDesc = "修改数据")
 	private void modify(HPPZ011 fPz011) {
 		DaoUtils.update(HPPZ011.UPDATE, fPz011);
 	}

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ012.xml

@@ -139,7 +139,7 @@
 
     <!-- 逻辑删除 -->
     <delete id="delete">
-        UPDATE FROM ${hpjxSchema}.T_HPPZ012 SET DELETE_FLAG = #deleteFlag# WHERE ID = #id#
+        UPDATE ${hpjxSchema}.T_HPPZ012 SET DELETE_FLAG = #deleteFlag# WHERE ID = #id#
     </delete>
 
     <update id="update">

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

@@ -226,7 +226,6 @@ public class ServiceHPSC003 extends ServiceBase {
 	 * @param dbSc003
 	 * @param dbSc004
 	 */
-	@OperationLogAnnotation(operModul = "生产计划",operType = "新增",operDesc = "生成任务订单")
 	private HPSC005 addSc005(HPSC003 dbSc003, HPSC004 dbSc004) {
 		HPSC005 newSc005 = BeanUtils.copy(dbSc003, HPSC005.class);
 		newSc005.setProdOrderNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPSC005_PROD_NO));

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

@@ -123,7 +123,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param dbSc005
 	 * @param fSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "生产订单-拆单派工A-新增")
 	private void add(HPSC005 dbSc005, HPSC005A fSc005a) {
 		String prodOrderNo = dbSc005.getProdOrderNo();
 		// 数据校验
@@ -148,7 +147,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param fSc005a
 	 * @param mapSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "修改",operDesc = "生产订单-拆单派工A-修改数据")
 	private void modify(HPSC005 dbSc005, HPSC005A fSc005a, Map<String, HPSC005A> mapSc005a) {
 		String prodOrderNo = dbSc005.getProdOrderNo();
 		// 数据校验
@@ -204,7 +202,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "刷新",operDesc = "生产订单-拆单派工A-刷新主订单信息")
 	private EiInfo refreshOrderInfo(EiInfo inInfo, String prodOrderNo) {
 		HPSC005 dbSc005 = HPSCTools.HpSc005.get(prodOrderNo);
 		inInfo.addBlock(CommonConstant.Field.DETAIL).addRow(dbSc005);
@@ -266,7 +263,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 *
 	 * @param fSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "设置",operDesc = "生产订单-拆单派工A-设置基础信息")
 	private void setBaseInfo(HPSC005A fSc005a) {
 		// 厂区名称
 		fSc005a.setFactoryName(HPPZTools.HpPz011.getFactoryName(fSc005a.getFactoryCode()));

src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java

@@ -141,7 +141,6 @@ public class ServiceHPZL001 extends ServiceBase {
 	 *
 	 * @param fZl001
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPZL001 fZl001) {
 		// 项目名称
 //		fZl001.setProjName(HPSCTools.HpSc001.get(fZl001.getProjCode()).getProjName());

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

@@ -112,6 +112,13 @@ $(function() {
                         }
                     }
                 });
+            },
+            onSuccess: function (e) {
+                if(e.eiInfo.extAttr.methodName == 'update'
+                    ||e.eiInfo.extAttr.methodName == 'insert'
+                    ||e.eiInfo.extAttr.methodName == 'delete' ){
+                    query();
+                }
             }
         }
     }

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

@@ -9,6 +9,11 @@ $(function () {
 				}
 			}],
 			loadComplete: function (grid) {
+			},
+			onSuccess: function (e) {
+				if(e.eiInfo.extAttr.methodName == 'delete' ){
+					query();
+				}
 			}
 		}
 	}

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

@@ -13,6 +13,11 @@ $(function () {
 		},
 		columns: [],
 		loadComplete: function (grid) {
+		},
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
 		}
 	}
 

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

@@ -10,7 +10,12 @@ $(function () {
 	        }],
 	        loadComplete: function (grid) {
 	        }
-        }
+        },
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
+		}
     }
 
 	// 查询

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

@@ -80,7 +80,14 @@ $(function() {
 		        }
 	        }],
             loadComplete: function (grid) {
-            }
+            },
+			onSuccess: function (e) {
+				if(e.eiInfo.extAttr.methodName == 'update'
+					||e.eiInfo.extAttr.methodName == 'insert'
+					||e.eiInfo.extAttr.methodName == 'delete' ){
+					query();
+				}
+			}
         }
     }
 

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

@@ -186,6 +186,13 @@ $(function() {
 					console.log(e.model.inventCode);*/
 					//e.preventDefault(); // 不关闭单元格
 				}
+			},
+			onSuccess: function (e) {
+				if(e.eiInfo.extAttr.methodName == 'update'
+					||e.eiInfo.extAttr.methodName == 'insert'
+					||e.eiInfo.extAttr.methodName == 'delete' ){
+					query();
+				}
 			}
 		}
 	}

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

@@ -13,6 +13,11 @@ $(function() {
 				}
 			}],
 			loadComplete: function (grid) {
+			},
+			onSuccess: function (e) {
+				if(e.eiInfo.extAttr.methodName == 'delete' ){
+					query();
+				}
 			}
 		}
 	}

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

@@ -34,7 +34,14 @@ $(function() {
 				inInfo.set("field", options.field);
 				refreshSelect(container, inInfo);
 			}
-		}]
+		}],
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
+		}
 	}
 
 });

src/main/webapp/HP/PZ/HPPZ002.js

@@ -18,7 +18,14 @@ $(function() {
 		    template: function (options) {
 			    return showUserName(options.updatedBy, options.updatedName);
 		    }
-	    }]
+	    }],
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
+		}
     }
 
 });

src/main/webapp/HP/PZ/HPPZ003.js

@@ -18,7 +18,14 @@ $(function() {
 			template: function (options) {
 				return showUserName(options.updatedBy, options.updatedName);
 			}
-		}]
+		}],
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
+		}
 	}
 
 });

src/main/webapp/HP/PZ/HPPZ004.js

@@ -18,7 +18,14 @@ $(function() {
 			template: function (options) {
 				return showUserName(options.updatedBy, options.updatedName);
 			}
-		}]
+		}],
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
+		}
 	}
 
 });

src/main/webapp/HP/PZ/HPPZ006.js

@@ -69,7 +69,14 @@ $(function() {
 					template: "#=textField#"
 				});
 			}
-		}]
+		}],
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
+		}
 	}
 
 });

src/main/webapp/HP/PZ/HPPZ007.js

@@ -18,7 +18,14 @@ $(function() {
 			template: function (options) {
 				return showUserName(options.updatedBy, options.updatedName);
 			}
-		}]
+		}],
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
+		}
 	}
 
 });

src/main/webapp/HP/PZ/HPPZ011.js

@@ -34,6 +34,13 @@ $(function () {
 			// 阻止默认请求，使用自定义删除
 			e.preventDefault();
 			deleteFunc();
+		},
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
 		}
 	}
 

src/main/webapp/HP/PZ/HPPZ012.js

@@ -116,6 +116,13 @@ $(function () {
 			// 阻止默认请求，使用自定义删除
 			e.preventDefault();
 			deleteFunc();
+		},
+		onSuccess: function (e) {
+			if(e.eiInfo.extAttr.methodName == 'update'
+				||e.eiInfo.extAttr.methodName == 'insert'
+				||e.eiInfo.extAttr.methodName == 'delete' ){
+				query();
+			}
 		}
 	}
 

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

@@ -43,7 +43,14 @@ $(function () {
 		        // 阻止后台删除请求，使用自定义删除
 		        e.preventDefault();
 		        deleteFunc();
-	        }
+	        },
+			onSuccess: function (e) {
+				if(e.eiInfo.extAttr.methodName == 'update'
+					||e.eiInfo.extAttr.methodName == 'insert'
+					||e.eiInfo.extAttr.methodName == 'delete' ){
+					query();
+				}
+			}
         }
     }
 

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

@@ -51,8 +51,8 @@
 			<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完成重量" colWidth="4" readonly="true"/>
 		</div>
 		<div class="row">
-			<EF:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" disabled="true" />
-			<EF:EFDatePicker ename="detail-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" disabled="true" />
+			<EF:EFDatePicker ename="detail-0-planCompletionDate" cname="计划完成日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
+			<EF:EFDatePicker ename="detail-0-actualCompletionDate" cname="实际完成时间" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="4" readonly="true" />
 		</div>
 	</EF:EFRegion>
 </EF:EFPage>

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

@@ -176,7 +176,13 @@ $(function () {
                     }
                 }
             ],
-
+            onSuccess: function (e) {
+                if(e.eiInfo.extAttr.methodName == 'update'
+                    ||e.eiInfo.extAttr.methodName == 'insert'
+                    ||e.eiInfo.extAttr.methodName == 'delete' ){
+                    query();
+                }
+            }
         }
 
     }

src/main/webapp/HP/ZL/HPZL001.js

@@ -140,6 +140,11 @@ $(function () {
 				// 阻止默认请求，使用自定义删除
 				e.preventDefault();
 				deleteFunc();
+			},
+			onSuccess: function (e) {
+				if(e.eiInfo.extAttr.methodName == 'delete' ){
+					query();
+				}
 			}
 		}
 	}