新增字段

src/custom/restcontroller/webmanage/sale/expressform/expressform.java

@@ -571,6 +571,8 @@ public class expressform extends Controller {
                     updateSQL.setValue("changeby", username);
                     updateSQL.setDateValue("changedate");
                     sqlList.add(updateSQL.getSQL());
+                    batchDeleteErr.addErr(row.getString("txlogisticid"),  (String) resultMap.get("reason"));
+                    continue;
                 }
             } else {
                 batchDeleteErr.addErr(row.getString("txlogisticid"), "请求电子面单接口超时");

src/custom/restcontroller/webmanage/sale/stockbill/SQL/出入库单明细列表查询(红).sql

@@ -6,6 +6,7 @@ SELECT t1.*,
        t2.icaddqty,
        t2.icminqty,
        t2.topclassnum,
+       t2.outplace,
        t3.unitname,
        t7.sonum,
        t8.stockname

src/custom/restcontroller/webmanage/sale/stockbill/SQL/出入库单明细列表查询.sql

@@ -6,6 +6,7 @@ SELECT t1.*,
        t2.icaddqty,
        t2.icminqty,
        t2.topclassnum,
+       t2.outplace,
        t3.unitname,
        t7.sonum,
        t8.stockname

src/custom/restcontroller/webmanage/sale/stockbill/stockbill.java

@@ -70,6 +70,7 @@ public class stockbill extends Controller {
         String delivery = content.getStringValue("delivery");
         String logisticsmethod = content.getStringValue("logisticsmethod");
         Rows invoicerows = dbConnect.runSqlQuery("select * from sys_enterprise_finance where sys_enterpriseid=" + sys_enterpriseid + " order by isdefault desc");
+        Rows addressrows = dbConnect.runSqlQuery("select * from sys_enterprise_contacts where sys_enterpriseid=" + sys_enterpriseid + " order by isdefault desc");
         String invoice_enterprisename = content.getStringValue("invoice_enterprisename");
         String invoice_address = content.getStringValue("invoice_address");
         String invoice_taxno = content.getStringValue("invoice_taxno");
@@ -1167,6 +1168,7 @@ public class stockbill extends Controller {
         String phonenumber = content.getStringValue("phonenumber");
         String address = content.getStringValue("address");
         BigDecimal agencyfund = content.getBigDecimal("agencyfund");
+        String ordertype = content.getStringValue("ordertype");
 
         JSONArray st_stockbillids=content.getJSONArray("st_stockbillids");
 
@@ -1195,7 +1197,7 @@ public class stockbill extends Controller {
             insertSQL.setUniqueid(expressformid);
             insertSQL.setSiteid(siteid);
             insertSQL.setValue("logisticproviderid", "YTO");
-            insertSQL.setValue("ordertype", "4");
+            insertSQL.setValue("ordertype", ordertype);
             insertSQL.setValue("agencyfund", agencyfund);
             insertSQL.setValue("itemname", "配件");
             insertSQL.setValue("number", 1);