订单明细新增已发货数量置为0

src/custom/beans/stockbill/bills/XSCK.java

@@ -131,7 +131,7 @@ public class XSCK extends BasicBill {
                 }
                 Rows rowsDispatchDetailGroup = dbConnect.runSqlQuery("select sum(t1.qty) qty,t1.sa_orderitemsid,t1.siteid from st_stockbill_items t1  where t1.sa_orderitemsid>0 and t1.st_stockbillid=" + st_stockbillid + " group by t1.sa_orderitemsid,t1.siteid");
                 for (Row row : rowsDispatchDetailGroup) {
-                    sqlList.add("update sa_orderitems set undeliqty=undeliqty-" + row.getDouble("qty") + ",deliedqty=deliedqty+" + row.getDouble("qty") + ",offstatus=if(billingstatus='保内收费','待核销','不可核销'),offdate=CURRENT_TIME  where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
+                    sqlList.add("update sa_orderitems set undeliqty=undeliqty-" + row.getDouble("qty") + ",deliedqty=ifnull(deliedqty,0)+" + row.getDouble("qty") + ",offstatus=if(billingstatus='保内收费','待核销','不可核销'),offdate=CURRENT_TIME  where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
                     sqlList.add("update sa_orderitems set tobeoffqty=case when tobeoffqty+" + row.getDouble("qty") + ">canoffqty then canoffqty else tobeoffqty+" + row.getDouble("qty") + " end where billingstatus='保内收费' and sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
 
                 }
@@ -271,7 +271,7 @@ public class XSCK extends BasicBill {
                 if(!billRow.getString("sourceobject").equals("tpartreimbursement")){
                     Rows rowsDispatchDetailGroup = dbConnect.runSqlQuery("select sum(t1.qty) qty,t1.sa_orderitemsid,t1.siteid from st_stockbill_items t1  where t1.sa_orderitemsid>0 and t1.st_stockbillid=" + st_stockbillid + " group by t1.sa_orderitemsid,t1.siteid");
                     for (Row row : rowsDispatchDetailGroup) {
-                        sqlList.add("update sa_orderitems set undeliqty=undeliqty-" + row.getDouble("qty") + ",deliedqty=deliedqty+" + row.getDouble("qty") + ",offstatus=if(billingstatus='保内收费','待核销','不可核销'),offdate=CURRENT_TIME  where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
+                        sqlList.add("update sa_orderitems set undeliqty=undeliqty-" + row.getDouble("qty") + ",deliedqty=ifnull(deliedqty,0)+" + row.getDouble("qty") + ",offstatus=if(billingstatus='保内收费','待核销','不可核销'),offdate=CURRENT_TIME  where sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
                         sqlList.add("update sa_orderitems set tobeoffqty=case when tobeoffqty+" + row.getDouble("qty") + ">canoffqty then canoffqty else tobeoffqty+" + row.getDouble("qty") + " end where billingstatus='保内收费' and sa_orderitemsid=" + row.getLong("sa_orderitemsid"));
                     }
                     for (Row row : itemRows) {

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

@@ -88,33 +88,35 @@ public class OrderItems extends Controller {
             Boolean isInsert = true;
             JSONArray customproperties = new JSONArray();
             if (sa_orderitemsid <= 0) {
-                Rows rows;
-                if(!type.equals("配件订单")){
-                    rows= dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and itemid=" + itemid + " and sa_orderid=" + sa_orderid + " and sa_promotion_itemsid=" + item.getLongValue("sa_promotion_itemsid"));
-                }else{
-                    if(StringUtils.isBlank(item.getStringValue("cardno"))){
-                        rows= dbConnect.runSqlQuery("SELECT t1.sa_orderitemsid,qty from sa_orderitems t1  WHERE t1.siteid='" + siteid + "' and ifnull(cardno,'')='' and t1.itemid=" + itemid + " and t1.sa_orderid=" + sa_orderid);
-                    }else{
-                        rows= dbConnect.runSqlQuery("SELECT t1.sa_orderitemsid,qty from sa_orderitems t1  WHERE t1.siteid='" + siteid + "' and t1.itemid=" + itemid + " and t1.sa_orderid=" + sa_orderid + " and ifnull(t1.cardno,'')='"+item.getStringValue("cardno")+"'");
-                    }
-
-                }
-
-                if (rows.isEmpty()) {
-                    sa_orderitemsid = createTableID("sa_orderitems");
-                } else {
-                    //System.out.println(beans.order.Order.getDefaultIsRepeatValue(siteid, type));
-                    if (beans.order.Order.getDefaultIsRepeatValue(siteid, type)) {
-                        sa_orderitemsid = createTableID("sa_orderitems");
-                        isInsert = true;
-                    } else {
-                        //price1 = rows.get(0).getBigDecimal("price");
-                        sa_orderitemsid = rows.get(0).getLong("sa_orderitemsid");
-                        item.put("qty",item.getBigDecimal("qty").add(rows.get(0).getBigDecimal("qty")));
-                        isInsert = false;
-                    }
-
-                }
+//                   Rows rows = new Rows();
+//                if(!type.equals("配件订单")){
+//                    rows= dbConnect.runSqlQuery("SELECT sa_orderitemsid,price from sa_orderitems WHERE siteid='" + siteid + "' and itemid=" + itemid + " and sa_orderid=" + sa_orderid + " and sa_promotion_itemsid=" + item.getLongValue("sa_promotion_itemsid"));
+//                }else{
+//                    if(StringUtils.isBlank(item.getStringValue("cardno"))){
+//                        rows= dbConnect.runSqlQuery("SELECT t1.sa_orderitemsid,qty from sa_orderitems t1  WHERE t1.siteid='" + siteid + "' and ifnull(cardno,'')='' and t1.itemid=" + itemid + " and t1.sa_orderid=" + sa_orderid);
+//                    }else{
+//                        rows= dbConnect.runSqlQuery("SELECT t1.sa_orderitemsid,qty from sa_orderitems t1  WHERE t1.siteid='" + siteid + "' and t1.itemid=" + itemid + " and t1.sa_orderid=" + sa_orderid + " and ifnull(t1.cardno,'')='"+item.getStringValue("cardno")+"'");
+//                    }
+//
+//                }
+                sa_orderitemsid = createTableID("sa_orderitems");
+                isInsert = true;
+//                if (rows.isEmpty()) {
+//                    sa_orderitemsid = createTableID("sa_orderitems");
+//                    isInsert = true;
+//                } else {
+//                    //System.out.println(beans.order.Order.getDefaultIsRepeatValue(siteid, type));
+//                    if (beans.order.Order.getDefaultIsRepeatValue(siteid, type)) {
+//                        sa_orderitemsid = createTableID("sa_orderitems");
+//                        isInsert = true;
+//                    } else {
+//                        //price1 = rows.get(0).getBigDecimal("price");
+//                        sa_orderitemsid = rows.get(0).getLong("sa_orderitemsid");
+//                        item.put("qty",item.getBigDecimal("qty").add(rows.get(0).getBigDecimal("qty")));
+//                        isInsert = false;
+//                    }
+//
+//                }
             } else {
                 isInsert = false;
             }
@@ -287,6 +289,7 @@ public class OrderItems extends Controller {
 
                 if (rows.isEmpty()) {
                     sa_orderitemsid = createTableID("sa_orderitems");
+                    isInsert = true;
                 } else {
                     //System.out.println(beans.order.Order.getDefaultIsRepeatValue(siteid, type));
                     if (beans.order.Order.getDefaultIsRepeatValue(siteid, type)) {

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

@@ -643,6 +643,7 @@ public class OrderItemsHelper extends BaseClass {
         //订购数量
         insertSQL.setValue("qty", qty);
         insertSQL.setValue("undeliqty", qty);
+        insertSQL.setValue("deliedqty", 0);
         //辅助单位数量
         insertSQL.setValue("auxqty", qty.divide(conversionrate));
         if (type.equals("特殊订单")) {