【海凌科】【新版物流发货二开】【淘宝标识判断调整】

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

@@ -65,7 +65,7 @@ public class SaleOutServiceImpl implements SaleOutService {
         }
         SqlRowList checkOrder = baseDao.queryForRowSet("select wm_concat(pd_ordercode) ordercode from (" +
                 " select PD_ORDERCODE from PRODIODETAIL LEFT JOIN SALE ON SA_CODE = PD_ORDERCODE left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno " +
-                " where pd_piid = " + id + " AND SA_REMARK = '淘宝自动抓取' and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') <> '对接成功' and not exists (select 1 from tbauthorization where tb_openuid = SA_TBOPENUID and validflag = 1 " +
+                " where pd_piid = " + id + " and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') <> '对接成功' and not exists (select 1 from tbauthorization where tb_openuid = SA_TBOPENUID and validflag = 1 " +
                 " group by PD_ORDERCODE))");
         if (checkOrder.next() && StringUtil.hasText(checkOrder.getGeneralString("ordercode"))) {
             retMap.put("success", false);
@@ -86,7 +86,7 @@ public class SaleOutServiceImpl implements SaleOutService {
         StringBuffer errorMsg = new StringBuffer();
         SqlRowList orderRowList = baseDao.queryForRowSet(" SELECT pd_ordercode,sa_tbopenuid " +
                 "    FROM PRODIODETAIL LEFT JOIN SALE ON SA_CODE = PD_ORDERCODE left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno " +
-                "    WHERE pd_piid = " + id + " AND SA_REMARK = '淘宝自动抓取' and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') <> '对接成功' " +
+                "    WHERE pd_piid = " + id + " and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') <> '对接成功' " +
                 "    group by pd_ordercode,sa_tbopenuid " +
                 "    order by min(pd_pdno) ");
         if(orderRowList.hasNext()){
@@ -121,8 +121,8 @@ public class SaleOutServiceImpl implements SaleOutService {
         }
         baseDao.execute("update PRODINOUT set pi_dockingstatus='对接失败' where pi_id = " + id + " and exists (select 1 from PRODIODETAIL where pd_piid = pi_id and nvl(pd_dockingstatus,' ')='对接失败') ");
         baseDao.execute("update PRODINOUT set pi_dockingstatus='已对接' where pi_id = " + id +
-                "    and exists (select 1 from PRODIODETAIL  LEFT JOIN SALE ON sa_code = pd_ordercode left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno where pd_piid = pi_id AND SA_REMARK = '淘宝自动抓取' and SA_TBOPENUID is not null and SD_OID>0 ) " +
-                "    and not exists (select 1 from PRODIODETAIL  LEFT JOIN SALE ON sa_code = pd_ordercode left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno where pd_piid = pi_id AND SA_REMARK = '淘宝自动抓取' and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') <> '对接成功' )");
+                "    and exists (select 1 from PRODIODETAIL  LEFT JOIN SALE ON sa_code = pd_ordercode left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno where pd_piid = pi_id and SA_TBOPENUID is not null and SD_OID>0 ) " +
+                "    and not exists (select 1 from PRODIODETAIL  LEFT JOIN SALE ON sa_code = pd_ordercode left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno where pd_piid = pi_id and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') <> '对接成功' )");
         if(errorMsg.length()>0){
             retMap.put("success", false);
             retMap.put("message", errorMsg.toString());
@@ -160,7 +160,7 @@ public class SaleOutServiceImpl implements SaleOutService {
         }
         SqlRowList checkOrder = baseDao.queryForRowSet("select wm_concat(pd_ordercode) ordercode from (" +
                 " select PD_ORDERCODE from PRODIODETAIL LEFT JOIN SALE ON SA_CODE = PD_ORDERCODE left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno " +
-                " where pd_piid = " + id + " AND SA_REMARK = '淘宝自动抓取' and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') = '对接成功' and not exists (select 1 from tbauthorization where tb_openuid = SA_TBOPENUID and validflag = 1 " +
+                " where pd_piid = " + id + " and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') = '对接成功' and not exists (select 1 from tbauthorization where tb_openuid = SA_TBOPENUID and validflag = 1 " +
                 " group by PD_ORDERCODE))");
         if (checkOrder.next() && StringUtil.hasText(checkOrder.getGeneralString("ordercode"))) {
             retMap.put("success", false);
@@ -181,7 +181,7 @@ public class SaleOutServiceImpl implements SaleOutService {
         StringBuffer errorMsg = new StringBuffer();
         SqlRowList orderRowList = baseDao.queryForRowSet(" SELECT pd_ordercode,sa_tbopenuid,wm_concat(sd_oid) oids " +
                 "    FROM PRODIODETAIL LEFT JOIN SALE ON SA_CODE = PD_ORDERCODE left join saledetail on sd_code = pd_ordercode and sd_detno = pd_orderdetno " +
-                "    WHERE pd_piid = " + id + " AND SA_REMARK = '淘宝自动抓取' and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') = '对接成功' " +
+                "    WHERE pd_piid = " + id + " and SA_TBOPENUID is not null and SD_OID>0 and nvl(pd_dockingstatus,' ') = '对接成功' " +
                 "    group by pd_ordercode,sa_tbopenuid " +
                 "    order by min(pd_pdno) ");
         if(orderRowList.hasNext()){