bug修复

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

@@ -243,7 +243,7 @@ public class expressform extends Controller {
                     batchDeleteErr.addErr(expressformid, "非新建状态的快递信息无法删除");
                     continue;
                 }
-                if (!StringUtils.isNotBlank(RowsStatus.get(0).getString("mailno"))) {
+                if (StringUtils.isNotBlank(RowsStatus.get(0).getString("mailno"))) {
                     batchDeleteErr.addErr(expressformid, "该快递信息单已填写'电子面单号'，无法删除!");
                     continue;
                 }

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -118,9 +118,7 @@ public class OrderItems extends Controller {
                 if(!type.equals("配件订单")){
                     rows= dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and itemid=" + itemid + " and sa_orderid=" + sa_orderid + " and sa_promotion_itemsid=" + item.getLongValue("sa_promotion_itemsid"));
                 }else{
-                    if(sa_customersid!=0){
-                        rows= dbConnect.runSqlQuery("SELECT t1.sa_orderitemsid,qty from sa_orderitems t1 left join sa_warrantycard t2 on t1.cardno=t2.cardno  WHERE t1.siteid='" + siteid + "' and t1.itemid=" + itemid + " and t1.sa_orderid=" + sa_orderid + " and t2.sa_customersid=" +sa_customersid);
-                    }
+                    rows= dbConnect.runSqlQuery("SELECT t1.sa_orderitemsid,qty from sa_orderitems t1 left join sa_warrantycard t2 on t1.cardno=t2.cardno  WHERE t1.siteid='" + siteid + "' and t1.itemid=" + itemid + " and t1.sa_orderid=" + sa_orderid + " and ifnull(t2.sa_customersid,0)=" +sa_customersid);
                 }
 
                 if (rows.isEmpty()) {

src/custom/restcontroller/webmanage/sale/u8/u8bills.java

@@ -44,8 +44,12 @@ public class u8bills  extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "u8bills","*");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sv_agents", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","agentnum","enterprisename","abbreviation");
+        querySQL.addJoinTable(JOINTYPE.left, "st_stockbill", "t3", "t3.st_stockbillid = t1.st_stockbillid AND t1.siteid = t3.siteid");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere("t1.u8id", u8id);
+        querySQL.addQueryFields("stockbill_name","t3.name");
+        querySQL.addQueryFields("stockbill_phonenumber","t3.phonenumber");
+        querySQL.addQueryFields("stockbill_address","t3.address");
         querySQL.setWhere(where);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();