Quellcode durchsuchen

送修单退钱处理单中的单价查询改为查询当时售价

wu vor 2 Monaten
Ursprung
Commit
b0996332ad
1 geänderte Dateien mit 17 neuen und 2 gelöschten Zeilen
  1. 17 2
      src/custom/restcontroller/webmanage/sale/sendrepair/sendrepair.java

+ 17 - 2
src/custom/restcontroller/webmanage/sale/sendrepair/sendrepair.java

@@ -112,7 +112,7 @@ public class sendrepair extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair_detail", "t4", "t1.sa_sendrepairid = t4.sa_sendrepairid AND t1.siteid = t4.siteid", "newspec", "newitemno", "newitemname",
                 "newitemid", "newsku", "agentcost", "practicalamount", "logisticscost", "logistics", "idearemarks", "disposition", "demand", "reason", "duty",
-                "stockdate", "enddate", "phonenumber", "name", "qty", "itemid", "sku", "price");
+                "stockdate", "enddate", "phonenumber", "name", "qty", "itemid", "sku");
         querySQL.addJoinTable(JOINTYPE.left, "plm_item", "t5", "t5.itemid = t4.itemid AND t5.siteid = t4.siteid", "itemname", "itemno", "spec", "model");
         querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t6", "t5.unitid = t6.unitid AND t5.siteid = t6.siteid", "unitname");
         querySQL.addQueryFields("remarksdetail", "t4.remarks");
@@ -124,6 +124,21 @@ public class sendrepair extends Controller {
 
         Rows stockbillrows = dbConnect.runSqlQuery("select * from st_stockbill where sourceid='" + sa_sendrepairid + "' and sourceobject='sa_sendrepair'");
 
+        if (rows.isNotEmpty()) {
+            String sku = rows.get(0).getString("sku");
+            String itemid = rows.get(0).getString("itemid");
+            String sql = "select t3.defaultprice from st_stockbill_items_sku t1 " +
+                    "inner join st_stockbill t2 on t2.st_stockbillid=t1.st_stockbillid " +
+                    "inner join st_stockbill_items t3 on t3.st_stockbillid=t2.st_stockbillid " +
+                    "where  t1.sku='" + sku + "' and t2.type='销售出库' and t1.itemid='" + itemid + "'";
+            Rows rows1 = dbConnect.runSqlQuery(sql);
+            if (rows1.isNotEmpty()) {
+                rows.get(0).put("price", rows1.get(0).getBigDecimal("defaultprice"));
+            }
+        } else {
+            rows.get(0).put("price", "0");
+        }
+
 
         QuerySQL querySumSQL = SQLFactory.createQuerySQL(this, "sa_sendrepair_pj", "sa_sendrepairid");
         querySumSQL.setTableAlias("t1");
@@ -836,7 +851,7 @@ public class sendrepair extends Controller {
      */
     public ArrayList<String> updatefitemno(boolean istrue, Row sendrepairdetail) throws YosException {
         ArrayList<String> sqlList = new ArrayList<>();
-        Rows skurows = dbConnect.runSqlQuery("select * from sa_itemsku where siteid='"+siteid+"' and sku='" + sendrepairdetail.getString("sku") + "' and status!='报废'");
+        Rows skurows = dbConnect.runSqlQuery("select * from sa_itemsku where siteid='" + siteid + "' and sku='" + sendrepairdetail.getString("sku") + "' and status!='报废'");
         if (skurows.isEmpty()) {
             throw new YosException("序列号不存在或已作废");
         }