修改 报关对接

src/main/java/com/uas/eis/serviceImpl/ErpServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.uas.eis.core.config.SpObserver;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.dao.SqlRowList;
 import com.uas.eis.entity.Master;
@@ -43,6 +44,7 @@ public class ErpServiceImpl implements ErpService {
 
     @Override
     public Map<String, Object> auditafter_post_xx(Integer id, String masterName) {
+        SpObserver.putSp(masterName);
         Map<String, Object> modelMap = new HashMap<String, Object>();
         int count = baseDao.getCount("select count(*) from prodinout where nvl(pi_issendxx,0)<>0 and pi_id=" + id);
         if (count>0){

src/main/java/com/uas/eis/serviceImpl/XiangXServiceImpl.java

@@ -3,7 +3,10 @@ package com.uas.eis.serviceImpl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.uas.eis.core.config.SpObserver;
 import com.uas.eis.dao.BaseDao;
+import com.uas.eis.dao.SqlRowList;
 import com.uas.eis.entity.Employee;
 import com.uas.eis.entity.Master;
 import com.uas.eis.service.*;
@@ -16,10 +19,7 @@ import sun.misc.BASE64Encoder;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 对接湘芯业务
@@ -50,6 +50,9 @@ public class XiangXServiceImpl implements XiangXService {
     @Autowired
     private EnterpriseService enterpriseService;
 
+    @Autowired
+    private MD5Util md5Util;
+
     static final String GET_PROCESS_UNDO_GROUP_U="SELECT * FROM (SELECT JPROCESSVIEW.*,EM_IMID, ROW_NUMBER() OVER(ORDER BY JP_LAUNCHTIME DESC,JP_ID DESC) RN FROM JPROCESSVIEW LEFT JOIN EMPLOYEE ON EM_CODE=JP_LAUNCHERID WHERE ((JP_NODEDEALMAN= ? AND JP_STATUS='待审批' ) AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_LAUNCHERNAME) LIKE ? ) OR ((JP_LAUNCHERID= ? AND JP_STATUS='未通过')  AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_PROCESSNOTE) LIKE ? )) WHERE RN<=? AND RN>=? ORDER BY CASE TYPECODE  WHEN 'process' THEN 1 WHEN 'transferprocess' THEN 2 WHEN 'procand' THEN 3 WHEN 'unprocess' THEN 4 END,RN ASC";
     static final String GET_PROCESS_ALREADYDO_U="SELECT * FROM (select JPROCESSALREADYDOVIEW.* ,ROW_NUMBER() OVER(ORDER BY JN_DEALTIME DESC) RN from JPROCESSALREADYDOVIEW WHERE JP_CODEVALUE IS NOT NULL AND CONCAT(CONCAT(JP_NAME,'#'||JP_LAUNCHERNAME),'#'||JP_CODEVALUE) LIKE ? AND JN_DEALMANID= ?)WHERE RN<=? AND RN >= ? ORDER BY RN ASC";
 
@@ -314,9 +317,8 @@ public class XiangXServiceImpl implements XiangXService {
         if (list!=null && list.size()>0){
             if (list.get(0)==null){
                 if(list.get(2)!=null && Integer.parseInt(list.get(2))>0){
-                    baseDao.updateByCondition("CUSTOMTABLE","ct_confirmstatus='已确认'","ct_id="+poId);
                     try {
-                        Map<String, Object> resMap = erpService.auditafter_post_xx(Integer.parseInt(list.get(2)), master);
+                        Map<String, Object> resMap = erpService.auditafter_post_xx(Integer.parseInt(list.get(2)), list.get(3));
                         if(resMap.get("success")!=null&&Boolean.parseBoolean((resMap.get("success")).toString())){
                             map.put("success", true);
                             map.put("error", "报关成功");