Просмотр исходного кода

销售出库单对接(dlb去除表头发货单编号的判断)

hu 2 лет назад
Родитель
Сommit
cbed6f2d4c
1 измененных файлов с 13 добавлено и 10 удалено
  1. 13 10
      src/custom/service/StockAutoDockDispatchService.java

+ 13 - 10
src/custom/service/StockAutoDockDispatchService.java

@@ -84,9 +84,18 @@ public class StockAutoDockDispatchService extends ServiceController {
                         String fsourcebillno = erpSainvoice.getString("fsourcebillno");
                         String fsourcetype = erpSainvoice.getString("fsourcetype");
                         long sa_dispatchid = 0;
-                        if (StringUtils.isNotBlank(fsourcebillno)) {
-                            if (dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='" + siteid + "' and  billno='" + fsourcebillno + "'").isNotEmpty()) {
-                                sa_dispatchid = dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='" + siteid + "' and  billno='" + fsourcebillno + "'").get(0).getLong("sa_dispatchid");
+                        if(siteid.equalsIgnoreCase("CCYOSG")){
+                            if (StringUtils.isNotBlank(fsourcebillno)) {
+                                if (dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='" + siteid + "' and  billno='" + fsourcebillno + "'").isNotEmpty()) {
+                                    sa_dispatchid = dbConnect.runSqlQuery("select sa_dispatchid from sa_dispatch where siteid='" + siteid + "' and  billno='" + fsourcebillno + "'").get(0).getLong("sa_dispatchid");
+                                } else {
+                                    JSONObject flag = new JSONObject();
+                                    flag.put("syncyosid", erpSainvoice.getStringValue("syncyosid"));
+                                    flag.put("fupdateflag", "4");
+                                    flag.put("fupdatewarnlog", "yos中不存在对应的发货单");
+                                    flags.add(flag);
+                                    continue;
+                                }
                             } else {
                                 JSONObject flag = new JSONObject();
                                 flag.put("syncyosid", erpSainvoice.getStringValue("syncyosid"));
@@ -95,16 +104,10 @@ public class StockAutoDockDispatchService extends ServiceController {
                                 flags.add(flag);
                                 continue;
                             }
-                        } else {
-                            JSONObject flag = new JSONObject();
-                            flag.put("syncyosid", erpSainvoice.getStringValue("syncyosid"));
-                            flag.put("fupdateflag", "4");
-                            flag.put("fupdatewarnlog", "yos中不存在对应的发货单");
-                            flags.add(flag);
-                            continue;
                         }
 
 
+
                         Long sa_cashbillid = 0L;
 
                         Rows stockbillRows = dbConnect.runSqlQuery("select * from st_stockbill where siteid='" + siteid + "' and status='审核' and billno='" + fbillnum + "'");