hu 5 месяцев назад
Родитель
Сommit
f6cc8d64e1

+ 2 - 2
src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -551,10 +551,10 @@ public class aftersalesmag extends Controller {
         SQLFactory sqlFactoryupdate;
         if (ischeck) {
             InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "st_stockbill");
-            long st_stockbillid = createTableID("STOCKBILL8");
+            long st_stockbillid = createTableID("st_stockbill");
             insertSQL.setUniqueid(st_stockbillid);
             insertSQL.setSiteid(siteid);
-            insertSQL.setValue("billno", createBillCode("stockbill"));
+            insertSQL.setValue("billno", createBillCode("STOCKBILL8"));
             insertSQL.setValue("type", "返修入库");
 //            insertSQL.setValue("typemx", "");
             insertSQL.setValue("sys_enterpriseid", rows.get(0).getLong("sys_enterpriseid"));

+ 1 - 1
src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -789,7 +789,7 @@ public class workorder extends Controller {
     @API(title = "查询工单所选新配件金额", apiversion = R.ID2025112114461803.v1.class)
     public String querynewitemamount() throws YosException {
         Long sa_workorderid = content.getLong("sa_workorderid");
-        Rows amountrows = dbConnect.runSqlQuery("select ROUND(t1.qty*ifnull(t2.marketprice,1), 2) amount from sa_workorder_node_items t1 inner join plm_item t2 on t1.itemid=t2.itemid where t1.isnew=1 and  t1.sa_workorderid="+sa_workorderid);
+        Rows amountrows = dbConnect.runSqlQuery("select ROUND(t1.qty*ifnull(t2.marketprice,0), 2) amount from sa_workorder_node_items t1 inner join plm_item t2 on t1.itemid=t2.itemid where t1.isnew=1 and  t1.sa_workorderid="+sa_workorderid);
         return getSucReturnObject().setData(amountrows.sum("amount")).toString();
     }