发货单明细新增接口修改

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

@@ -133,8 +133,6 @@ public class dispatchItems extends Controller {
     @API(title = "新建或修改发货单商品明细", apiversion = R.ID20221115104603.v1.class,intervaltime = 200)
     @CACHEING_CLEAN(apiClass = {dispatchItems.class, dispatch.class})
     public String insertormodify_dispatchItems() throws YosException {
-        //通过版本更新发货单表头数据
-        Dispatch.updateDispatchWithVersion(this);
         Long sa_dispatchid = content.getLong("sa_dispatchid");
         JSONArray iteminfos = content.getJSONArray("iteminfos");
         ArrayList<String> sqlList = new ArrayList<>();
@@ -158,41 +156,56 @@ public class dispatchItems extends Controller {
                     .runSqlQuery("select sa_dispatch_itemsid from sa_dispatch_items where sa_dispatch_itemsid="
                             + iteminfo.getLong("sa_dispatch_itemsid"))
                     .isEmpty()) {
-                Rows sa_dispatch_itemsrows = dbConnect.runSqlQuery("select sa_dispatch_itemsid,qty,remarks from sa_dispatch_items where sa_dispatchid="
-                        + sa_dispatchid + " and sa_orderitemsid=" + iteminfo.getLong("sa_orderitemsid"));
-                if (!sa_dispatch_itemsrows.isEmpty()) {
-                    SQLFactory saleFactory = new SQLFactory(this, "发货单明细更新");
-                    saleFactory.addParameter("sa_dispatch_itemsid", sa_dispatch_itemsrows.get(0).getLong("sa_dispatch_itemsid"));
-                    // saleFactory.addParameter("itemno", iteminfo.getString("itemno"));
-                    saleFactory.addParameter("qty", iteminfo.getBigDecimal("qty").add(sa_dispatch_itemsrows.get(0).getBigDecimal("qty")));
-                    if (!StringUtils.isBlank(iteminfo.getString("remarks"))) {
-                        saleFactory.addParameter("remarks", iteminfo.getString("remarks"));
-                    } else {
-                        saleFactory.addParameter("remarks", sa_dispatch_itemsrows.get(0).getString("remarks"));
-                    }
-
-                    saleFactory.addParameter("userid", userid);
-                    saleFactory.addParameter("username", username);
-                    saleFactory.addParameter("billno", rowscount.get(0).getString("billno"));
-                    saleFactory.addParameter("batchno", iteminfo.getStringValue("batchno"));
-                    sqlList.add(saleFactory.getSQL());
-                } else {
-                    SQLFactory saleFactory = new SQLFactory(this, "发货单明细新增");
-                    saleFactory.addParameter("siteid", siteid);
-                    saleFactory.addParameter("rowno", maxid + i + 1);
-                    saleFactory.addParameter("sa_dispatch_itemsid", sa_dispatch_itemsid[i]);
-                    saleFactory.addParameter("sa_dispatchid", sa_dispatchid);
-                    saleFactory.addParameter("sa_orderitemsid", iteminfo.getLong("sa_orderitemsid"));
-                    saleFactory.addParameter("itemid", iteminfo.getString("itemid"));
-                    saleFactory.addParameter("qty", iteminfo.getBigDecimal("qty"));
-                    saleFactory.addParameter("batchcontrol", iteminfo.getBooleanValue("batchcontrol"));
-                    saleFactory.addParameter("batchno", "");
-                    saleFactory.addParameter("remarks", iteminfo.getString("remarks"));
-                    saleFactory.addParameter("userid", userid);
-                    saleFactory.addParameter("username", username);
-                    saleFactory.addParameter("billno", rowscount.get(0).getString("billno"));
-                    sqlList.add(saleFactory.getSQL());
-                }
+//                Rows sa_dispatch_itemsrows = dbConnect.runSqlQuery("select sa_dispatch_itemsid,qty,remarks from sa_dispatch_items where sa_dispatchid="
+//                        + sa_dispatchid + " and sa_orderitemsid=" + iteminfo.getLong("sa_orderitemsid"));
+//                if (!sa_dispatch_itemsrows.isEmpty()) {
+//                    SQLFactory saleFactory = new SQLFactory(this, "发货单明细更新");
+//                    saleFactory.addParameter("sa_dispatch_itemsid", sa_dispatch_itemsrows.get(0).getLong("sa_dispatch_itemsid"));
+//                    // saleFactory.addParameter("itemno", iteminfo.getString("itemno"));
+//                    saleFactory.addParameter("qty", iteminfo.getBigDecimal("qty").add(sa_dispatch_itemsrows.get(0).getBigDecimal("qty")));
+//                    if (!StringUtils.isBlank(iteminfo.getString("remarks"))) {
+//                        saleFactory.addParameter("remarks", iteminfo.getString("remarks"));
+//                    } else {
+//                        saleFactory.addParameter("remarks", sa_dispatch_itemsrows.get(0).getString("remarks"));
+//                    }
+//
+//                    saleFactory.addParameter("userid", userid);
+//                    saleFactory.addParameter("username", username);
+//                    saleFactory.addParameter("billno", rowscount.get(0).getString("billno"));
+//                    saleFactory.addParameter("batchno", iteminfo.getStringValue("batchno"));
+//                    sqlList.add(saleFactory.getSQL());
+//                } else {
+//                    SQLFactory saleFactory = new SQLFactory(this, "发货单明细新增");
+//                    saleFactory.addParameter("siteid", siteid);
+//                    saleFactory.addParameter("rowno", maxid + i + 1);
+//                    saleFactory.addParameter("sa_dispatch_itemsid", sa_dispatch_itemsid[i]);
+//                    saleFactory.addParameter("sa_dispatchid", sa_dispatchid);
+//                    saleFactory.addParameter("sa_orderitemsid", iteminfo.getLong("sa_orderitemsid"));
+//                    saleFactory.addParameter("itemid", iteminfo.getString("itemid"));
+//                    saleFactory.addParameter("qty", iteminfo.getBigDecimal("qty"));
+//                    saleFactory.addParameter("batchcontrol", iteminfo.getBooleanValue("batchcontrol"));
+//                    saleFactory.addParameter("batchno", "");
+//                    saleFactory.addParameter("remarks", iteminfo.getString("remarks"));
+//                    saleFactory.addParameter("userid", userid);
+//                    saleFactory.addParameter("username", username);
+//                    saleFactory.addParameter("billno", rowscount.get(0).getString("billno"));
+//                    sqlList.add(saleFactory.getSQL());
+//                }
+                SQLFactory saleFactory = new SQLFactory(this, "发货单明细新增");
+                saleFactory.addParameter("siteid", siteid);
+                saleFactory.addParameter("rowno", maxid + i + 1);
+                saleFactory.addParameter("sa_dispatch_itemsid", sa_dispatch_itemsid[i]);
+                saleFactory.addParameter("sa_dispatchid", sa_dispatchid);
+                saleFactory.addParameter("sa_orderitemsid", iteminfo.getLong("sa_orderitemsid"));
+                saleFactory.addParameter("itemid", iteminfo.getString("itemid"));
+                saleFactory.addParameter("qty", iteminfo.getBigDecimal("qty"));
+                saleFactory.addParameter("batchcontrol", iteminfo.getBooleanValue("batchcontrol"));
+                saleFactory.addParameter("batchno", "");
+                saleFactory.addParameter("remarks", iteminfo.getString("remarks"));
+                saleFactory.addParameter("userid", userid);
+                saleFactory.addParameter("username", username);
+                saleFactory.addParameter("billno", rowscount.get(0).getString("billno"));
+                sqlList.add(saleFactory.getSQL());
                 i++;
             } else {
                 SQLFactory saleFactory = new SQLFactory(this, "发货单明细更新");