订单明细非新建可以删除bug修复及商品同步更新

src/custom/restcontroller/webmanage/lsak3/item/item.java

@@ -151,7 +151,7 @@ public class item extends Controller {
                 long itemid = itemRows.get(0).getLong("itemid");
                 sqlFactory = new SQLFactory(this,"货品档案更新");
                 sqlFactory.addParameter("itemid",itemid);
-                Rows customitemRows = dbConnect.runSqlQuery("select spec,color,material,cheek,t1.status,t1.isonsale,t1.sa_customschemeid from plm_item t1 left join plm_itemextend t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.itemid="+itemid);
+                Rows customitemRows = dbConnect.runSqlQuery("select widthschemeid,lengthschemeid,spec,color,material,cheek,t1.status,t1.isonsale,t1.sa_customschemeid from plm_item t1 left join plm_itemextend t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.itemid="+itemid);
                 if(!customitemRows.isEmpty()){
                     if(customitemRows.get(0).getString("spec").equals(flong) && customitemRows.get(0).getString("color").equals(fcolour)
                             && customitemRows.get(0).getString("material").equals(fbx) && customitemRows.get(0).getString("cheek").equals(fbk)){
@@ -277,8 +277,14 @@ public class item extends Controller {
             sqlFactory.addParameter("k3outcode", foutitemno);
 
             if(fisdz.equals("1")){
-                sqlFactory.addParameter("widthschemeid",1);
-                sqlFactory.addParameter("lengthschemeid", 1);
+                if(!itemRows.isEmpty()){
+                    sqlFactory.addParameter("widthschemeid",itemRows.get(0).getLong("widthschemeid"));
+                    sqlFactory.addParameter("lengthschemeid", itemRows.get(0).getLong("lengthschemeid"));
+                }else{
+                    sqlFactory.addParameter("widthschemeid",1);
+                    sqlFactory.addParameter("lengthschemeid", 1);
+                }
+
                 sqlFactory.addParameter("pricingmetod", 1);
 
             }else{

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

@@ -580,7 +580,7 @@ public class dispatch extends Controller {
         }
         Rows orderRows = dbConnect.runSqlQuery("select distinct t1.sa_orderid from sa_orderitems t1 inner join sa_dispatch_items t2 on t1.siteid=t2.siteid and t1.sa_orderitemsid=t2.sa_orderitemsid where t1.siteid='" + siteid + "' and t2.sa_dispatchid=" + sa_dispatchid);
         for (Row row : orderRows) {
-            sqlList.add("update sa_order set status='审核' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='" + siteid + "'");
+            //sqlList.add("update sa_order set status='审核' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='" + siteid + "'");
         }
         SQLFactory sqlFactoryupdate = new SQLFactory(this, "发货单关闭");
         sqlFactoryupdate.addParameter("siteid", siteid);

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

@@ -331,11 +331,21 @@ public class OrderItems extends Controller {
     @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, ToolBill.class})
     public String delete() throws YosException {
         Long sa_orderid = content.getLong("sa_orderid");
+        Rows orderRows = getOrderRows(this, sa_orderid);
+        if (orderRows.isEmpty()) {
+            return getErrReturnObject().setErrMsg("数据不存在，无法添加").toString();
+        } else {
+            if (!orderRows.get(0).getString("status").equals("新建")) {
+                return getErrReturnObject().setErrMsg("非新建状态无法删除").toString();
+            }
+        }
 
         //通过版本更新订单表头数据
         beans.order.Order.updateOrderWithVersion(this);
 
 
+
+
         JSONArray sa_orderitemsids = content.getJSONArray("sa_orderitemsids");
         SQLFactory sqlFactory = new SQLFactory(this, "订单商品明细_删除");
         sqlFactory.addParameter("siteid", siteid);
@@ -347,7 +357,6 @@ public class OrderItems extends Controller {
         //居间费设置
         updateRebateFee(sa_orderid);
         //调整价格（返利金）
-        Rows orderRows = getOrderRows(this, sa_orderid);
         if (orderRows.get(0).getBoolean("rebate_used")) {
             setRebateAmount(this, sa_orderid, getMaxUsedRebateAmount(this, sa_orderid));
             adjustLastRebateAmount(this, sa_orderid);