Merge branch 'dev' of http://git.pseer.com/platform/hp-smart into dev

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

@@ -95,7 +95,7 @@
 	<select id="query" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC010">
 		SELECT <include refid="column"/>
 		FROM hpjx.T_HPKC010
-        WHERE 1=1
+        WHERE 1=1 AND  AMOUNT!=0
         <include refid="condition"/>
         <include refid="customCondition"/>
 		<dynamic prepend="ORDER BY">

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

@@ -44,11 +44,15 @@ public class ServiceHPMT001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    public EiInfo pmOverview(EiInfo inInfo) {
+    public Map pmOverview(EiInfo inInfo) {
+        Map resultMap = new HashMap();
+        try {
             String queryMonth = inInfo.getString("queryMonth");
             String companyCode = UserSessionUtils.getCompanyCode();
             if (StrUtil.isEmpty(companyCode)) {
-            inInfo.setMsg("账号异常");
+                resultMap.put("status", 403);
+                resultMap.put("message","票据过期或请求不合法，请重新登录或获取合法权限！");
+                return resultMap;
             }
             Map sqlMap = new HashMap();
             sqlMap.put("queryMonth", queryMonth);
@@ -56,9 +60,7 @@ public class ServiceHPMT001 extends ServiceBase {
             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();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
-        try {
             Date parse = sdf.parse(queryMonth);
             Calendar instance = Calendar.getInstance();
             instance.setTime(parse);
@@ -132,15 +134,13 @@ public class ServiceHPMT001 extends ServiceBase {
                 resultMap.put("actualWt_h_yoy", actualWt.subtract(actualWt2).divide(actualWt2,BigDecimal.ROUND_UP).
                         multiply(new BigDecimal(100)).doubleValue());
             }
-        rows.add(resultMap);
-        EiInfo outInfo = new EiInfo();
-        EiBlock eiBlock = new EiBlock(EiConstant.resultBlock);
-        eiBlock.setRows(rows);
-        outInfo.setBlock(eiBlock);
-        return outInfo;
-        } catch (ParseException e) {
-            e.printStackTrace();
-            return inInfo;
+            resultMap.put("status",EiConstant.STATUS_SUCCESS);
+            resultMap.put("message","SUCCESS");
+        return resultMap;
+        } catch (Exception e) {
+            resultMap.put("status", 500);
+            resultMap.put("message",LogUtils.getMsg(e));
+            return resultMap;
         }
 
     }
@@ -151,24 +151,31 @@ public class ServiceHPMT001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    public EiInfo pmBenchmarking(EiInfo inInfo) {
+    public Map pmBenchmarking(EiInfo inInfo) {
+        Map resultMap = new HashMap();
+        try {
         String queryMonth = inInfo.getString("queryMonth");
         String companyCode = UserSessionUtils.getCompanyCode();
         if (StrUtil.isEmpty(companyCode)) {
-            inInfo.setMsg("账号异常");
+                resultMap.put("status", 403);
+                resultMap.put("message","票据过期或请求不合法，请重新登录或获取合法权限！");
+                return resultMap;
         }
         Map sqlMap = new HashMap();
         sqlMap.put("queryMonth", queryMonth);
         sqlMap.put("companyCode", companyCode);
         List<Map> rows = this.dao.query("HPMT001.pmBenchmarking", sqlMap);
         List<Map> rows2 = this.dao.query("HPMT001.pmBenchmarking2", sqlMap);
-        EiInfo outInfo = new EiInfo();
-        EiBlock eiBlock = new EiBlock(EiConstant.resultBlock);
-        eiBlock.setRows(rows);
-        outInfo.setBlock(eiBlock);
-        outInfo.set("cout",rows2);
-
-        return outInfo;
+        resultMap.put("result",rows);
+        resultMap.put("result2",rows2);
+            resultMap.put("status",EiConstant.STATUS_SUCCESS);
+            resultMap.put("message","SUCCESS");
+        return resultMap;
+        } catch (Exception e) {
+            resultMap.put("status", 500);
+            resultMap.put("message",LogUtils.getMsg(e));
+            return resultMap;
+        }
     }
 
 }

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

@@ -312,7 +312,7 @@
 
 
         <select id="queryFvalue" resultClass="java.util.HashMap">
-                SELECT FVALUE AS "fvalue" FROM iplat.TEDCC03 WHERE FKEY='docRootDir'
+                SELECT DISTINCT FVALUE AS "fvalue" FROM iplat.TEDCC03 WHERE FKEY='docRootDir'
         </select>
 
 

src/main/java/com/baosight/hpjx/hp/mt/untils/UploadUtils.java

 package com.baosight.hpjx.hp.mt.untils;
 
+import com.baosight.hpjx.core.dao.DaoBase;
 import com.baosight.iplat4j.core.data.ibatis.dao.Dao;
 import com.baosight.iplat4j.core.data.id.UUIDHexIdGenerator;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -44,10 +45,12 @@ public class UploadUtils {
             filePath = multipartFile.getOriginalFilename();
             Long docSize = multipartFile.getSize();
             String chgName = transformFileName(filePath);
+            System.out.println("----------------------------------解析Path");
             String attachmentName;
                 Map<String, String> pathMap = getRealPath("A");
                 msg = (String)pathMap.get("dirId");
                 category = (String)pathMap.get("path");
+        System.out.println("----------------------------------获取dirId成功");
                 checkInvalidPath(category);
                 File dir = new File(category);
                 if (!dir.exists()) {
@@ -116,7 +119,10 @@ public class UploadUtils {
     public static Map<String, String> getRealPath(String path) {
         String postPath = preparePath(path);
         String dirId = initPath(postPath);
-        List<Map> query = dao.query("HPMT002.queryFvalue");
+        Map hashMap = new HashMap();
+        hashMap.put("fkey","docRootDir");
+        List<Map> query = DaoBase.getInstance().query("EDCC03.query",hashMap);
+        System.out.println("----------------------------------获取path地址");
         if (query.get(0).get("fvalue")!=null) {
             ROOT_PATH= (String) query.get(0).get("fvalue");
         }

src/main/java/com/baosight/hpjx/hp/mt/untils/UploadUtils2.java

 package com.baosight.hpjx.hp.mt.untils;
 
+import com.baosight.hpjx.core.dao.DaoBase;
 import com.baosight.iplat4j.core.data.ibatis.dao.Dao;
 import com.baosight.iplat4j.core.data.id.UUIDHexIdGenerator;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -13,17 +14,17 @@ import com.baosight.iplat4j.eu.dm.util.FileProcessUtils;
 import com.baosight.iplat4j.eu.dm.util.IFileUploader;
 import net.sf.json.JSONObject;
 import org.apache.commons.codec.binary.Base64;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class UploadUtils2 {
     private static Dao dao = (Dao)PlatApplicationContext.getApplicationContext().getBean("dao");
@@ -32,10 +33,9 @@ public class UploadUtils2 {
             String docName = multipartFile.getOriginalFilename();
             Long docSize = multipartFile.getSize();
             HashMap<String, String> inMap = new HashMap();
-    
-        Map<String, String> returnMap = null;
-
-            returnMap = PlatFileUploadUtils.uploadFile(multipartFile, inMap);
+            inMap.put("groupId", "hk_file11");
+            inMap.put("configPathDefine", "A");
+            Map<String, String> returnMap = PlatFileUploadUtils.uploadFile(multipartFile, inMap);
             String docId = (String)returnMap.get("docId");
             String docUrl = (String)returnMap.get("docUrl");
             docId = docId == null ? "" : docId;
@@ -45,15 +45,13 @@ public class UploadUtils2 {
             } else {
                 documentJSON.remove("docUrl");
             }
-
             documentJSON.put("groupId", returnMap.get("groupId") == null ? "" : returnMap.get("groupId"));
             documentJSON.put("docName", docName);
             documentJSON.put("docSize", docSize);
             documentJSON.put("docType", docName.substring(docName.lastIndexOf(46)));
 
         return documentJSON;
-    }
-
 
 
+    }
 }

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

@@ -96,7 +96,7 @@ public class ServiceHPPZ015 extends ServiceBase {
             HPPZ015.setProjCode(hpsc001.getProjCode());
             HPPZ015.setTemplateName(inInfo.getString("templateName"));
             HPPZ015.setCreatedBy(UserSession.getUserId());
-            HPPZ015.setCompanyCode(UserSession.getUserId());
+            HPPZ015.setCompanyCode(UserSessionUtils.getCompanyCode());
             HPPZ015.setCreatedName(UserSession.getUserId()+"-"+UserSession.getLoginCName());
             HPPZ015.setCreatedTime(sdf.format(new Date()));
             HPPZ015.setUpdatedBy(null);

src/main/java/com/baosight/hpjx/hp/xs/sql/HPXSOrg.xml

@@ -176,7 +176,7 @@
     </select>
 
     <!-- 查询组织信息 -->
-    <select id="queryTedcm01"  resultClass="com.baosight.iplat4j.common.ed.domain.TEDCM01">
+    <select id="queryTedcm01"  resultClass="java.util.HashMap">
         SELECT
         ITEM_CODE AS "itemCode",
         ITEM_CNAME AS "itemCname"

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

@@ -381,26 +381,8 @@ function checkIn(id) {
         callbackName: checkInCallback
     });
 }
-checkInCallback = function () {
-    var block = detailGrid.getEiBlock();
-    var result = resultGrid.getCheckedRows()
-    if (rows.length < 1) {
-        message("请选择数据");
-        return;
-    }
-    if (block != null) {
-        block.setRows([]);
-        detailGrid.setEiBlock(block);
-    }
-    var info = new EiInfo()
-    var productionOrderNo = result[0]['prodOrderNo'];
-
-    info.set("productionOrderNo",productionOrderNo);
-    EiCommunicator.send("HPSC006","queryDetail",info,{
-        onSuccess:function(ei){//返回结果集
-            detailGrid.setEiInfo(ei);
-        },onFail:function(ei){}
-    },{async:false});
+checkInCallback = function (e) {
+    detailGrid.setEiInfo(e);
 }
 let selectStock = function (id) {
     JSColorbox.open({