配件核销单核销功能优化

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

@@ -368,6 +368,7 @@ public class tpartreimbursement extends Controller {
         }
         String tableName = "st_stockbill";
         Rows stocks=dbConnect.runSqlQuery("select stockid from st_stock where stockname='配件仓库' and siteid='"+siteid+"'");
+        Rows department=dbConnect.runSqlQuery("select departmentid from sys_department where depname='售后部' and siteid='"+siteid+"'");
 
         long st_stockbillid = createTableID(tableName);
         InsertSQL insertSQL = SQLFactory.createInsertSQL(this, tableName);
@@ -375,7 +376,11 @@ public class tpartreimbursement extends Controller {
         insertSQL.setSiteid(siteid);
         insertSQL.setValue("sys_enterpriseid", sys_enterpriseid);
         insertSQL.setValue("rec_contactsid", 0);
-        insertSQL.setValue("departmentid", departmentid);
+        if(department.isEmpty()){
+            insertSQL.setValue("departmentid", 0);
+        }else {
+            insertSQL.setValue("departmentid", department.get(0).getLong("departmentid"));
+        }
         if(stocks.isEmpty()){
             insertSQL.setValue("stockid", 0);
         }else {
@@ -385,7 +390,7 @@ public class tpartreimbursement extends Controller {
         insertSQL.setValue("typemx", "");
         insertSQL.setValue("sa_supplierid", content.getLongValue("sa_supplierid"));
         insertSQL.setValue("rb", 0);
-        insertSQL.setValue("remarks", "配件核销;");
+        insertSQL.setValue("remarks", "配件核销;"+content.getStringValue("remarks"));
         insertSQL.setValue("billdate", getDate_Str());
         String billno= createBillCode("stockbill");
         insertSQL.setValue("billno",billno);
@@ -435,9 +440,9 @@ public class tpartreimbursement extends Controller {
                 insertDetailSQL.setValue("itemid", iteminfo.getLongValue("itemid"));
                 insertDetailSQL.setValue("sa_orderid", 0);
                 insertDetailSQL.setValue("qty", iteminfo.getBigDecimal("qty"));
-                insertDetailSQL.setValue("discountrate", 1);
+                insertDetailSQL.setValue("discountrate", iteminfo.getBigDecimal("discountrate"));
                 insertDetailSQL.setValue("sa_dispatch_itemsid", 0);
-//                insertDetailSQL.setValue("defaultprice", iteminfo.getStringValue("defaultprice"));
+                insertDetailSQL.setValue("defaultprice", iteminfo.getBigDecimal("defaultprice"));
                 insertDetailSQL.setValue("remarks", "");
                 insertDetailSQL.setValue("itemno", iteminfo.getStringValue("itemno"));
                 insertDetailSQL.setValue("itemname", iteminfo.getStringValue("itemname"));