bug修复

src/custom/restcontroller/R.java

@@ -7000,6 +7000,10 @@ public class R {
         public static class v1 {
         }
     }
+    public static class ID2025122319361203 {
+        public static class v1 {
+        }
+    }
 
 }
 

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

@@ -398,7 +398,7 @@ public class accessoryorder extends Controller {
     public QuerySQL queryListManage(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
                 "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "rec_contactsid", "delivery","logisticsmethod", "tracknumber", "mailno"
-                ,"invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber","province","city","county","sys_enterpriseid");
+                ,"invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber","province","city","county","sys_enterpriseid","abstract");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid = t1.sys_enterpriseid and t2.siteid = t1.siteid",
                 "enterprisename","abbreviation");

src/custom/restcontroller/webmanage/sale/serviceorder/SQL/服务申请单详情查询.sql

@@ -22,7 +22,9 @@ SELECT
     t12.sys_enterpriseid sys_enterpriseid_initiate,
     t12.agentnum agentnum_initiate,
     t12.enterprisename enterprisename_initiate,
-    t12.abbreviation abbreviation_initiate
+    t12.abbreviation abbreviation_initiate,
+    t14.cardno warrantycardno,
+    t14.isvoid warrantyisvoid
 FROM
     sa_serviceorder t1
         LEFT JOIN sys_enterprise t2 ON t1.sys_enterpriseid = t2.sys_enterpriseid
@@ -39,4 +41,6 @@ FROM
         left join sa_warrantycard t10 on t8.cardno=t10.cardno
         left join sys_enterprise_hr t11 on t11.userid=t1.createuserid  AND t11.siteid = t1.siteid
         left join sv_agents t12 on t12.sys_enterpriseid=t11.sys_enterpriseid  AND t12.siteid = t11.siteid
+        left join sa_workorder t13 on t13.sa_serviceorderid=t1.sa_serviceorderid  AND t13.siteid = t1.siteid
+        left join sa_warrantycard t14 on t14.sa_workorderid=t13.sa_workorderid  AND t14.siteid = t13.siteid
 	where t1.siteid=$siteid$  and t1.sa_serviceorderid=$sa_serviceorderid$

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

@@ -833,16 +833,18 @@ public class serviceorder extends Controller {
         for (Object o : sa_serviceorderids) {
             long sa_serviceorderid = Long.parseLong(o.toString());
             Rows RowsStatus = dbConnect
-                    .runSqlQuery("select sa_serviceorderid,status from sa_serviceorder where siteid='" + siteid
-                            + "' and sa_serviceorderid='" + sa_serviceorderid + "'");
+                    .runSqlQuery("select t3.sa_warrantycardid from sa_serviceorder t1 left join sa_workorder t2 on t1.sa_serviceorderid=t2.sa_serviceorderid left join sa_warrantycard t3 on t3.sa_workorderid=t2.sa_workorderid  where t1.siteid='" + siteid
+                            + "' and t1.sa_serviceorderid='" + sa_serviceorderid + "' and ifnull(t3.cardno,'')!=''");
 
             if (RowsStatus.isNotEmpty()) {
-                if (!RowsStatus.get(0).getString("status").equals("新建")) {
-                    //batchDeleteErr.addErr(sa_serviceorderid, "非新建状态的服务申请单无法删除");
-                    //continue;
+                if (RowsStatus.isNotEmpty()) {
+                    batchDeleteErr.addErr(sa_serviceorderid, "服务申请单已生成保修卡，不允许删除");
+                    continue;
                 }
             }
 
+
+
             dbConnect.runSqlUpdate("delete from sa_serviceorder where siteid='" + siteid + "' and sa_serviceorderid="
                     + sa_serviceorderid);
             dbConnect.runSqlUpdate("delete from sa_workorder where siteid='" + siteid + "' and sa_serviceorderid="

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

@@ -15,6 +15,7 @@ import common.YosException;
 import common.annotation.API;
 import common.annotation.CACHEING;
 import common.annotation.CACHEING_CLEAN;
+import common.crm.bean.warrantycard;
 import common.data.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -25,6 +26,8 @@ import restcontroller.webmanage.sale.order.Order;
 import restcontroller.webmanage.sale.order.OrderItems;
 import restcontroller.webmanage.sale.sendrepair.sendrepair;
 import restcontroller.webmanage.sale.sendrepair.sendrepair_pj;
+import restcontroller.webmanage.sale.serviceorder.serviceorder;
+import restcontroller.webmanage.sale.workorder.workorder;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -46,6 +49,24 @@ public class stockbill extends Controller {
         super(content);
     }
 
+    @API(title = "发货备注填写", apiversion = R.ID2025122319361203.v1.class)
+    @CACHEING_CLEAN(apiClass = {Order.class})
+    public String changeabstract() throws YosException {
+        Long st_stockbillid = content.getLong("st_stockbillid");
+        String abstract1 = content.getString("abstract");
+
+        ArrayList<String> sqllist = new ArrayList<>();
+
+        Rows orderRows = dbConnect.runSqlQuery("select distinct sa_orderid from st_stockbill_items where st_stockbillid ='"
+                + st_stockbillid + "' and  siteid='" + siteid + "'");
+        for(Row row :orderRows){
+            sqllist.add("update sa_order set abstract='"+abstract1+"' where sa_orderid="+row.getLong("sa_orderid"));
+        }
+        dbConnect.runSqlUpdate(sqllist);
+
+        return getSucReturnObject().toString();
+    }
+
     @API(title = "新增销售出库单", apiversion = R.ID2025043010105603.v1.class)
     @CACHEING_CLEAN(apiClass = {stockbill.class, stockbillitems.class})
     public String insertormodify_stockbill() throws YosException {

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

@@ -182,17 +182,18 @@ public class tpartreimbursement extends Controller {
 
 
 
-//        QuerySQL querySQLdetail = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementid", "sa_tpartreimbursementdetailid");
-//        querySQLdetail.setTableAlias("t1");
-//        querySQLdetail.addJoinTable(JOINTYPE.left, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid", "*");
-//        querySQLdetail.setWhere("t1.siteid", siteid);
-//        querySQLdetail.setWhere("t1.sa_tpartreimbursementid", rows.toArrayList("sa_tpartreimbursementid"));
-//        Rows rowsdetail = querySQL.query();
-//        RowsMap rowsMap = rowsdetail.toRowsMap("sa_tpartreimbursementid");
-//        for (Row row : rows) {
-//            row.put("totalamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).sum("amount"));
-//            row.put("offamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).toRowsMap("offstatus").get("已核销").sum("amount"));
-//        }
+        QuerySQL querySQLdetail = SQLFactory.createQuerySQL(this, "sa_tpartreimbursementdetail", "sa_tpartreimbursementid", "sa_tpartreimbursementdetailid","qty","isverified");
+        querySQLdetail.setTableAlias("t1");
+        querySQLdetail.addJoinTable(JOINTYPE.left, "sa_orderitems", "t2", "t1.sa_orderitemsid = t2.sa_orderitemsid AND t1.siteid = t2.siteid", "price");
+        querySQLdetail.setWhere("t1.siteid", siteid);
+        querySQLdetail.setWhere("t1.sa_tpartreimbursementid", rows.toArrayList("sa_tpartreimbursementid"));
+        querySQLdetail.addQueryFields("amount","ROUND(t2.price*t1.qty)");
+        Rows rowsdetail = querySQLdetail.query();
+        RowsMap rowsMap = rowsdetail.toRowsMap("sa_tpartreimbursementid");
+        for (Row row : rows) {
+            row.put("totalamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).sum("amount"));
+            row.put("offamount", rowsMap.get(row.getString("sa_tpartreimbursementid")).toRowsMap("isverified").get("1").sum("amount"));
+        }
         return getSucReturnObject().setData(rows).toString();
     }