bug修复

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退单明细列表查询.sql

@@ -1,7 +1,7 @@
 SELECT
     t1.sa_aftersalesmag_itemsid,
     t1.sa_aftersalesmagid,
-	t1.sa_orderitemsid,
+	  t1.sa_orderitemsid,
     t1.itemid,
     ifnull(t1.qty,0) qty,
     ifnull(t1.price,0) price,
@@ -20,10 +20,12 @@ SELECT
     t2.height,
     t2.width,
     t2.length,
-    t3.unitname
+    t3.unitname,
+    (t5.deliedqty-ifnull(t5.returnqty,0)) canuseqty
 FROM
     sa_aftersalesmag_items t1
     left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid
     LEFT JOIN plm_unit t3 ON t3.unitid = t2.unitid AND t3.siteid = t2.siteid
     LEFT JOIN sa_aftersalesmag t4 ON t4.sa_aftersalesmagid = t1.sa_aftersalesmagid AND t4.siteid = t1.siteid
+     left join sa_orderitems t5 on t1.sa_orderitemsid = t5.sa_orderitemsid and t1.siteid = t5.siteid
 where $where$ and t1.siteid=$siteid$ and t1.sa_aftersalesmagid=$sa_aftersalesmagid$

src/custom/restcontroller/webmanage/sale/aftersalesmag/SQL/返退商品列表查询.sql

@@ -6,7 +6,7 @@ SELECT
 	t1.itemname,
 	t1.model,
 	t1.unit,
-	t1.qty,
+	(t1.deliedqty-ifnull(t1.returnqty,0)) qty,
 	t1.price,
 	t1.returnqty,
 	t1.amount,

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

@@ -69,11 +69,23 @@ public class OrderItems extends Controller {
         //查询erp库存
 //        Invbal.selectErpInvbal(this, items);
 
+        Rows itemRows =dbConnect.runSqlQuery("select itemid,orderaddqty,orderminqty,itemno from plm_item where siteid='"+siteid+"'");
+        RowsMap itemRowsMap= itemRows.toRowsMap("itemid");
         for (Object obj : items) {
             JSONObject item = (JSONObject) obj;
             Long itemid = item.getLong("itemid");
             Long sa_orderitemsid = item.getLong("sa_orderitemsid");
             BigDecimal qty = item.getBigDecimalValue("qty");
+            if(itemRowsMap.containsKey(item.getString("itemid"))){
+                if(itemRowsMap.get(item.getString("itemid")).isNotEmpty()){
+                   BigDecimal orderaddqty =itemRowsMap.get(item.getString("itemid")).get(0).getBigDecimal("orderaddqty");
+                   BigDecimal orderminqty =itemRowsMap.get(item.getString("itemid")).get(0).getBigDecimal("orderminqty");
+                   if(((qty.subtract(orderminqty)).remainder(orderaddqty)).compareTo(BigDecimal.ZERO)!=0){
+                       return getErrReturnObject().setErrMsg("品号为"+itemRowsMap.get(item.getString("itemid")).get(0).getString("itemno")+"的商品数量不符合该商品的起订量和增量").toString();
+                   }
+
+                }
+            }
             BigDecimal price1=new BigDecimal(0);
             SQLFactory sqlFactory = new SQLFactory(this, "订单商品明细_新增");
             if (sa_orderitemsid <= 0) {