【英唐-CATL条码对接】【按DC顺序创建、新增对接异常日志输出】

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

@@ -160,6 +160,7 @@ public class ERPServiceImpl implements ERPService {
                                 errMsg.append("条码创建数与实际不一致，型号:"+matnr).append("创建数:"+panIdList.size()+",待更新数量:"+updateList.getResultList().size()).append("</br>");
                             }
                         }else {
+                            logger.info("getToken-F:"+res);
                             if(StringUtil.hasText(resData.get("e_message"))){
                                 errMsg.append("客户料号:"+matnr).append(resData.get("e_message")).append("</br>");
                             }else {
@@ -342,6 +343,7 @@ public class ERPServiceImpl implements ERPService {
                                 baseDao.execute(sqls);
                             }
                         }else {
+                            logger.info("getToken-F:"+res);
                             if(StringUtil.hasText(resData.get("e_message"))){
                                 errMsg.append("客户料号:"+matnr).append(resData.get("e_message")).append("</br>");
                             }else {
@@ -382,13 +384,15 @@ public class ERPServiceImpl implements ERPService {
         SpObserver.putSp(master);
         //创建中
         baseDao.execute("update CatlDoc set CA_DOCSTATE=2 where ca_id = "+id);
-        SqlRowList docList = baseDao.queryForRowSet("select cd_cpn,min(CD_DC) ztcnno,pr_capacity zzbsmount,pr_zxbzs zzxsmount,pr_zxbzs zbzsmount ,cd_newboxcode " +
+        SqlRowList docList = baseDao.queryForRowSet("SELECT * FROM ( " +
+                "select cd_cpn,min(CD_DC) ztcnno,pr_capacity zzbsmount,pr_zxbzs zzxsmount,pr_zxbzs zbzsmount ,cd_newboxcode " +
                 "  ,sum(CD_QTY) zmount,cd_wflag zwidth,ca_code||'_'||cd_newboxcode zzstz " +
                 "  ,cd_newboxcode||(case when cd_remark is not null then ' '||cd_remark else '' end) zremark,count(1) codecount,wm_concat(cd_id) cd_ids  " +
                 "from CatlDocDetail left join product on pr_code = CD_PRCODE left join CatlDoc on ca_id = cd_caid " +
                 "where cd_caid = ? and nvl(pr_capacity,0)>0 " +
-                "and CD_PANID is null "+
-                " group by CD_CPN,pr_capacity,pr_zxbzs,cd_wflag,cd_remark,cd_newboxcode,ca_code||'_'||cd_newboxcode order by min(cd_detno)",id);
+                " and CD_PANID is null "+
+                " group by CD_CPN,pr_capacity,pr_zxbzs,cd_wflag,cd_remark,cd_newboxcode,ca_code||'_'||cd_newboxcode order by min(cd_detno)" +
+                " ) order by ztcnno,to_number(cd_newboxcode)",id);
         if(!docList.hasNext()){
             retMap.put("success",false);
             retMap.put("message","没有需要对接的明细.");
@@ -532,6 +536,7 @@ public class ERPServiceImpl implements ERPService {
                                 errMsg.append("条码创建数与实际不一致，型号:"+matnr).append("【cd_ids：").append(cd_ids).append("】创建数:"+panIdList.size()+",待更新数量:"+updateList.getResultList().size()).append("</br>");
                             }
                         }else {
+                            logger.info("createStickerByCenter-F:"+res);
                             if(StringUtil.hasText(resData.get("e_message"))){
                                 errMsg.append("客户料号:"+matnr).append(resData.get("e_message")).append("</br>");
                             }else {