Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -85,7 +85,8 @@ public class sendplandetail extends Controller {
                 // 查询库存总量
                 invbalqty = invbalSalerowsMap.get(row.getString("itemid")).get(0).getBigDecimal("qty");
             }
-            insertSQL.setValue("willinqty", willoutqty);
+            insertSQL.setValue("willinqty", 0);
+            insertSQL.setValue("willoutqty", willoutqty);
             insertSQL.setValue("sendqty", getBigDecimalOrZero(row.getBigDecimal("sendqty")));
 
 
@@ -104,7 +105,7 @@ public class sendplandetail extends Controller {
 
             // 设置计算后的值
             insertSQL.setValue("canuseqty",oldCanuseqty);
-            insertSQL.setValue("willinqty",oldWilloutqty);
+            insertSQL.setValue("willoutqty",oldWilloutqty);
 
 
             // 如果可用量<=0，设置发货量为0