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

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

@@ -317,7 +317,7 @@ public class OrderItems extends Controller {
             return getErrReturnObject().setErrMsg("订单明细不存在").toString();
         }
         if(!orderitemsRows.get(0).getString("billingstatus").equals("保内收费")){
-            return getErrReturnObject().setErrMsg("行号【"+orderitemsRows.get(0).getString("rowno")+"】为非保内收费配件，无法更新可核销数").toString();
+            //return getErrReturnObject().setErrMsg("行号【"+orderitemsRows.get(0).getString("rowno")+"】为非保内收费配件，无法更新可核销数").toString();
         }
         if(orderitemsRows.get(0).getBigDecimal("qty").compareTo(canoffqty)<0){
             return getErrReturnObject().setErrMsg("可核销数不可大于商品明细行数量").toString();

src/custom/restcontroller/webmanage/sale/stockbill/stockbillitems.java

@@ -208,17 +208,15 @@ public class stockbillitems extends Controller {
                         }else{
                             insertSQL.setValue("stockid", stockRowsMap.get("101").get(0).getLong("stockid"));
                         }
-                    }else if(rowscount.get(0).getString("type").equals("其他出库")){
-                        if(rowscount.get(0).getLong("stockid")!=0){
-                            insertSQL.setValue("stockid", rowscount.get(0).getLong("stockid"));
-                        }else{
-                            insertSQL.setValue("stockid",itemRowsMap.containsKey(iteminfo.getStringValue("itemid"))?itemRowsMap.get(iteminfo.getStringValue("itemid")).get(0).getLong("stockid"):iteminfo.getLongValue("stockid"));
-                        }
+                    }
+                }else if(rowscount.get(0).getString("type").equals("其他出库")){
+                    if(rowscount.get(0).getLong("stockid")!=0){
+                        insertSQL.setValue("stockid", rowscount.get(0).getLong("stockid"));
                     }else{
-                        insertSQL.setValue("stockid", iteminfo.getLong("stockid"));
+                        insertSQL.setValue("stockid",itemRowsMap.containsKey(iteminfo.getStringValue("itemid"))?itemRowsMap.get(iteminfo.getStringValue("itemid")).get(0).getLong("stockid"):iteminfo.getLongValue("stockid"));
                     }
                 }else{
-                    insertSQL.setValue("stockid", iteminfo.getLongValue("stockid"));
+                    insertSQL.setValue("stockid", iteminfo.getLong("stockid"));
                 }
 
                 insertSQL.setValue("itemid", iteminfo.getStringValue("itemid"));
@@ -240,7 +238,7 @@ public class stockbillitems extends Controller {
                 if(StringUtils.isBlank(rowscount.get(0).getString("name"))
                         || StringUtils.isBlank(rowscount.get(0).getString("phonenumber"))
                         ||  StringUtils.isBlank(rowscount.get(0).getString("address"))){
-                    Rows orderRows =dbConnect.runSqlQuery("select * from sa_order where sa+sa_orderid="+iteminfo.getLongValue("sa_orderid"));
+                    Rows orderRows =dbConnect.runSqlQuery("select * from sa_order where sa_orderid="+iteminfo.getLongValue("sa_orderid"));
                     if(orderRows.isNotEmpty()){
                         sqlList.add("update st_stockbill set name='"+orderRows.get(0).getString("contact")+"',phonenumber='"+orderRows.get(0).getString("phonenumber")+"',address='"+orderRows.get(0).getString("address")+"' where st_stockbillid="+st_stockbillid);
                     }