Merge branch 'develop' into develop2

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

@@ -908,10 +908,15 @@ public class dispatch extends Controller {
                     } else {
                         row.put("delinvbalqty", row.containsKey("invbalqty") ? row.getBigDecimal("invbalqty") : BigDecimal.ZERO);
                     }
-
+                    JSONObject response =new JSONObject();
+                    response.put("sumQtyRows",sumQtyRows);
+                    response.put("rowsDispatchDetailGroupByItem",rowsDispatchDetailGroupByItem);
                     if (row.getBigDecimal("qty").compareTo(row.getBigDecimal("delinvbalqty")) > 0) {
+                        erpDocking.saveLog(this, "sa_dispatch", sa_dispatchid, "发货单复核", "", response, dispatchRows.get(0).getString("billno"));
                         return getErrReturnObject().setErrMsg("发货商品" + row.getString("itemno") + "，库存不足，无法操作复核！")
                                 .toString();
+                    }else{
+                        erpDocking.saveLog(this, "sa_dispatch", sa_dispatchid, "发货单复核", "", response, dispatchRows.get(0).getString("billno"));
                     }
                 }
             }