【华信科】【富勒WMS对接】【确认过账失败提示异常】

src/main/java/com/uas/eis/service/Impl/ERPSWMServiceImpl.java

@@ -138,29 +138,29 @@ public class ERPSWMServiceImpl implements ERPWMSService {
         String res = baseDao.callProcedure(masterCode + ".DOCWMS_IO_CONFIRM", new Object[]{piId, null});
         if (res != null && !res.trim().equals("")) {
             logger.info("IOConfirm-Err: {}", res);
-            if (res.startsWith("AFTERSUCCESS:")) {
-//                wmsApiResult.setMessage("成功但是有异常：" + res.replaceAll("AFTERSUCCESS:", ""));
-                res = res.replaceAll("AFTERSUCCESS:", "");
-            }
+//            if (res.startsWith("AFTERSUCCESS:")) {
+                wmsApiResult.setMessage("成功但是有异常：" + res.replaceAll("AFTERSUCCESS:", ""));
+//                res = res.replaceAll("AFTERSUCCESS:", "");
+//            }
 //            else {
-                wmsApiResult.setFlag("failure");
-                wmsApiResult.setCode("403");
-                wmsApiResult.setMessage(res);
-                resp.setResponse(wmsApiResult);
-                return resp;
+//                wmsApiResult.setFlag("failure");
+//                wmsApiResult.setCode("403");
+//                wmsApiResult.setMessage(res);
+//                resp.setResponse(wmsApiResult);
+//                return resp;
 //            }
         }
         //内部交易对接:
         //出货单 -> 采购验收单 国内->国内
-        if ("openapi.adjustmentorder.confirm".equals(method) && StringUtil.hasText(piMsg.getGeneralString("pi_postmastercode"))) {
+        if (res == null && "openapi.adjustmentorder.confirm".equals(method) && StringUtil.hasText(piMsg.getGeneralString("pi_postmastercode"))) {
             String toSob = piMsg.getGeneralString("pi_postmastercode");
             if (masterCode.indexOf("HK")<0 && StringUtil.hasText(toSob) && toSob.indexOf("HK")<0
 //                    "NBZK".equals(piMsg.getGeneralString("pi_wmsordertype"))
 //                    ||"QTCK".equals(piMsg.getGeneralString("pi_wmsordertype"))
 //                    ||"QTCKZF".equals(piMsg.getGeneralString("pi_wmsordertype"))
             ) {
-
-                SqlRowList pito = baseDao.queryForRowSet("select pi_id,pi_inoutno,pi_class,ds_table,pi_wmsordertype,pi_sendwmsflag,pi_wmsstatus from " + toSob + ".prodinout left join documentsetup on ds_name = pi_class  " +
+                SqlRowList pito = baseDao.queryForRowSet("select pi_id,pi_inoutno,pi_class,ds_table,pi_wmsordertype,pi_sendwmsflag,pi_wmsstatus " +
+                        "from " + toSob + ".prodinout left join documentsetup on ds_name = pi_class  " +
                         "where pi_sourcecode='" + piMsg.getGeneralString("pi_inoutno") + "' and pi_sourcetype = '" + piMsg.getGeneralString("pi_class") + "'");
                 if (pito.next()) {
                     if (pito.getGeneralInt("pi_sendwmsflag") == 0&& !"已确认".equals(pito.getGeneralString("pi_wmsstatus"))