Merge branch 'develop' into develop2

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

@@ -911,6 +911,8 @@ public class dispatch extends Controller {
                     JSONObject response =new JSONObject();
                     response.put("sumQtyRows",sumQtyRows);
                     response.put("rowsDispatchDetailGroupByItem",rowsDispatchDetailGroupByItem);
+                    response.put("errcode",0);
+
                     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") + "，库存不足，无法操作复核！")