商品未添加禁止审核

src/custom/restcontroller/webmanage/sale/logistics/LSALogistics.java

@@ -274,8 +274,8 @@ public class LSALogistics extends Controller {
                 JSONObject jsonObject = wzwlDocking.queryWzwlOrderAmountExtendList(row.getString("billno"));
                 if(jsonObject.getString("success").equals("true")){
                     JSONArray data = jsonObject.getJSONArray("data");
-                    dbConnect.runSqlUpdate("update sa_logistics set logisticsamount="+((JSONObject)data.get(0)).getBigDecimalValue("transportFee")+",volume='"+(((JSONObject)data.get(0)).getBigDecimalValue("volume").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("volume"):row.getDouble("volume"))+"',weight='"+(((JSONObject)data.get(0)).getBigDecimalValue("weight").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("weight"):row.getDouble("weight"))+"' where sa_logisticsid="+sa_logisticsid);
-                    row.put("logisticsamount",((JSONObject)data.get(0)).getBigDecimalValue("transportFee"));
+                    dbConnect.runSqlUpdate("update sa_logistics set logisticsamount="+(((JSONObject)data.get(0)).getBigDecimalValue("transportFee").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("transportFee"):row.getDouble("logisticsamount"))+",volume='"+(((JSONObject)data.get(0)).getBigDecimalValue("volume").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("volume"):row.getDouble("volume"))+"',weight='"+(((JSONObject)data.get(0)).getBigDecimalValue("weight").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("weight"):row.getDouble("weight"))+"' where sa_logisticsid="+sa_logisticsid);
+                    row.put("logisticsamount",(((JSONObject)data.get(0)).getBigDecimalValue("transportFee").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("transportFee"):row.getDouble("logisticsamount")));
                     row.put("volume",(((JSONObject)data.get(0)).getBigDecimalValue("volume").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("volume"):row.getDouble("volume")));
                     row.put("weight",(((JSONObject)data.get(0)).getBigDecimalValue("weight").compareTo(BigDecimal.ZERO)>0?((JSONObject)data.get(0)).getBigDecimalValue("weight"):row.getDouble("weight")));
                 }
@@ -448,6 +448,7 @@ public class LSALogistics extends Controller {
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("请选择物流单").toString();
         }
+
         Row logisticsRow = rows.get(0);
         String billno = logisticsRow.getString("billno");
         String status = logisticsRow.getString("status");
@@ -479,6 +480,10 @@ public class LSALogistics extends Controller {
         }
         if (status.equals("新建")) {
 
+            Rows itemrows = LSALogisticsHelper.getLogisticsItemsRows(this);
+            if (itemrows.isEmpty()) {
+                return getErrReturnObject().setErrMsg("商品未添加禁止审核").toString();
+            }
             Rows itemsrows = dbConnect.runSqlQuery("SELECT * from sa_logistics_items WHERE sa_logisticsid=" + sa_logisticsid + " and siteid='" + siteid + "'");
             for (Row item : itemsrows) {
                 Long st_stockbill_itemsid = item.getLong("st_stockbill_itemsid");

src/custom/restcontroller/webmanage/sale/logistics/LSALogisticsHelper.java

@@ -27,6 +27,10 @@ public class LSALogisticsHelper extends BaseClass {
         return controller.dbConnect.runSqlQuery("select * from sa_logistics where siteid='" + controller.siteid + "' and sa_logisticsid=" + controller.content.getLongValue("sa_logisticsid"));
     }
 
+    public static Rows getLogisticsItemsRows(Controller controller) throws YosException {
+        return controller.dbConnect.runSqlQuery("select * from sa_logistics_items where siteid='" + controller.siteid + "' and sa_logisticsid=" + controller.content.getLongValue("sa_logisticsid"));
+    }
+
     /**
      * 企业是否存在
      *