Browse Source

对接取明细关联批次调整

dingyl 5 years ago
parent
commit
b2cdafe8c3
1 changed files with 12 additions and 1 deletions
  1. 12 1
      src/main/java/com/uas/eis/serviceImpl/ErpServiceImpl.java

+ 12 - 1
src/main/java/com/uas/eis/serviceImpl/ErpServiceImpl.java

@@ -45,6 +45,7 @@ public class ErpServiceImpl implements ErpService {
     @Override
     public Map<String, Object> auditafter_post_xx(Integer id, String masterName) {
         SpObserver.putSp(masterName);
+        System.out.println(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){
@@ -162,7 +163,10 @@ public class ErpServiceImpl implements ErpService {
                     //备注
                     dataMaps.put("orderRemark",prodinouts[8]);
                 }
-                SqlRowList rs = baseDao.queryForRowSet("select pi_id,pi_class,pi_inoutno,pi_whcode,pr_brand,pr_detail,pd_prodcode,pd_orderprice,pi_currency,pr_spec,pd_ordercode,pd_orderdetno,pi_inoutno,pd_pdno,pd_inqty,pd_outqty,pd_needcheck,pr_needserialnumber,ba_ordercode,to_char(ba_date,'yyyy-MM-dd') ba_date,ba_orderdetno,nvl(pr_ts_user,0) pr_ts_user from prodinout left join ProdIODetail  on pd_piid=pi_id  left join Product on pd_prodcode = pr_code left join batch on ba_code=pd_batchcode where pi_id=" + id+" order by pd_pdno");
+                SqlRowList rs = baseDao.queryForRowSet("select pi_id,pi_class,pi_inoutno,pi_whcode,pr_brand,pr_detail,pd_prodcode,pd_orderprice,pi_currency,pr_spec,pd_ordercode," +
+                        "pd_orderdetno,pi_inoutno,pd_pdno,pd_inqty,pd_outqty,pd_needcheck,pr_needserialnumber,ba_ordercode,to_char(ba_date,'yyyy-MM-dd') ba_date," +
+                        "ba_orderdetno,nvl(pr_ts_user,0) pr_ts_user from prodinout left join ProdIODetail  on pd_piid=pi_id  left join Product on pd_prodcode = pr_code " +
+                        "left join batch on ba_code=pd_batchcode and pd_prodcode=ba_prodcode and pd_whcode=ba_whcode where pi_id=" + id+" order by pd_pdno");
                 while (rs.next()) {
                     Map<String, Object> data = new HashMap<>();
                     //物料编码
@@ -238,9 +242,12 @@ public class ErpServiceImpl implements ErpService {
                 // 当前时间戳
                 params.put("timeStamp", timestamp);
                 HttpUtil.Response response = null;
+                System.out.println(url);
                 try {
                     response = HttpUtil.doPostWithHead(url, JSON.toJSONString(params),false,null,Authorization);
                 } catch (Exception e) {
+                    System.out.println("Exception");
+                    System.out.println( e.getMessage());
                     baseDao.execute("insert into ERPSYNC_MESSAGELOG (EL_ID,EL_DATA,EL_TYPE,EL_ERROR,EL_DATE,EL_STATUS,EL_CODE) values " +
                             "(ERPSYNC_MESSAGELOG_SEQ.nextval,'','" + piClass + "','发送湘芯科技请求失败',sysdate,0,'" + inoutno + "')");
                     UpdateProdinOutLog(id,false);
@@ -253,6 +260,10 @@ public class ErpServiceImpl implements ErpService {
                 com.alibaba.fastjson.JSONObject parseObject = JSONArray.parseObject(responseText);
                 String responseCode = parseObject.getString("code");
                 String err = parseObject.getString("message");
+                System.out.println("responseCode");
+                System.out.println(responseCode);
+                System.out.println("err");
+                System.out.println(err);
                 if("S0000".equals(responseCode)){
                     baseDao.execute("insert into ERPSYNC_MESSAGELOG (EL_ID,EL_DATA,EL_TYPE,EL_ERROR,EL_DATE,EL_STATUS,EL_CODE) values " +
                             "(ERPSYNC_MESSAGELOG_SEQ.nextval,'','" + piClass + "','发送湘芯科技成功',sysdate,0,'" + inoutno + "')");