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

src/custom/restcontroller/sale/aftersalesmag/aftersalesmag.java

@@ -56,19 +56,30 @@ public class aftersalesmag extends Controller {
             }
         }
 
+        QuerySQL t5 = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku", "sku").setTableAlias("t1");
+        t5.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t2.st_stockbillid=t1.st_stockbillid", "st_stockbillid", "checkdate");
+        t5.setWhere("t2.type='返修入库' and t2.status = '审核'");
+
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_aftersalesmag", "*");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid","enterprisename");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid","agentnum");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid","name","phonenumber","address",
-                "stockdate","enddate","model","unitname","itemname","itemno","duty","demand","machinecode","reason","qty","itemid");
-        querySQL.addQueryFields("remarksdetail","t4.remarks");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid", "enterprisename");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid", "name", "phonenumber", "address",
+                "stockdate", "enddate", "model", "unitname", "itemname", "itemno", "duty", "demand", "machinecode", "reason", "qty", "itemid");
+
+        querySQL.addJoinTable(JOINTYPE.left, t5, "t5", "t5.sku=t4.machinecode");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t6", "t6.sourcetable='st_stockbill' and t6.sourceid=t5.st_stockbillid");
+
+        querySQL.addQueryFields("remarksdetail", "t4.remarks");
+        querySQL.addQueryFields("incheckdate", "t5.checkdate");
+        querySQL.addQueryFields("outcheckdate", "t6.checkdate");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
-        querySQL.setWhere("t1.sys_enterpriseid",sys_enterpriseid);
+        querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
-        
+
 //        ArrayList<Long> ids = rows.toArrayList("sa_aftersalesmagid", new ArrayList<>());
 //        //查询反退金额
 //        RowsMap aftersalesmagReturnAmountRowsMap = Aftersalesmag.getAftersalesmagReturnAmount(this, ids);
@@ -163,7 +174,7 @@ public class aftersalesmag extends Controller {
         ArrayList<String> sqlList = new ArrayList<>();
         Rows sa_aftersalesmag_itemsRows = dbConnect.runSqlQuery("select t1.machinecode from sa_aftersalesmag_items t1 where t1.sa_aftersalesmagid=" + sa_aftersalesmagid);
         for (Row row : sa_aftersalesmag_itemsRows) {
-            sqlList.add("update sa_itemsku set isreturn=1,stockid=0 where sku='" + row.getString("machinecode")+"'");
+            sqlList.add("update sa_itemsku set isreturn=1,stockid=0 where sku='" + row.getString("machinecode") + "'");
         }
 
         //        for (Row row : sa_aftersalesmag_itemsRows) {

src/custom/restcontroller/sale/enterprise/SQL/银行卡信息列表查询.sql

@@ -1,13 +1,4 @@
-select t1.sys_enterprise_bankid,
-       t1.sys_enterpriseid,
-       t1.name,
-       t1.bank,
-       t1.bankcardno,
-       t1.phonenumber,
-       t1.createby,
-       t1.createdate,
-       t1.changeby,
-       t1.changedate
-from sys_enterprise_bank t1   
-where t1.siteid = $siteid$ and t1.sys_enterpriseid=$sys_enterpriseid$
+select t1.*,t2.sys_enterpriseid from sa_bankabcxccard t1
+                                         INNER JOIN sa_agents t2 ON t2.sa_agentsid=t1.sa_agentsid
+WHERE  t1.siteid = $siteid$ and t2.sys_enterpriseid=$sys_enterpriseid$
   and $where$

src/custom/restcontroller/sale/enterprise/enterprise.java

@@ -142,8 +142,8 @@ public class enterprise extends Controller {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
                 where.append(" and(");
-                where.append("t1.bank like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t1.bankcardno like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("t1.xncardnoabc like'%").append(whereObject.getString("condition")).append("%' ");
+
                 where.append(")");
             }
         }

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

@@ -309,15 +309,24 @@ public class aftersalesmag extends Controller {
     @CACHEING
     public String queryaftersalesmagMain() throws YosException {
         Long sa_aftersalesmagid = content.getLong("sa_aftersalesmagid");
+
+        QuerySQL t5 = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku", "sku").setTableAlias("t1");
+        t5.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t2.st_stockbillid=t1.st_stockbillid", "st_stockbillid", "checkdate");
+        t5.setWhere("t2.type='返修入库' and t2.status = '审核'");
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_aftersalesmag", "*");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid", "enterprisename","abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid", "name", "phonenumber", "address",
                 "stockdate", "enddate", "model", "spec", "unitname", "itemname", "itemno", "duty", "demand", "machinecode", "qty", "itemid");
+        querySQL.addJoinTable(JOINTYPE.left, t5, "t5", "t5.sku=t4.machinecode");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t6", "t6.sourcetable='st_stockbill' and t6.sourceid=t5.st_stockbillid");
 //        querySQL.addJoinTable(JOINTYPE.left, "sa_warrantycard", "t5", "t5.sku = t4.machinecode AND t5.siteid = t4.siteid", "cardno");
         querySQL.addQueryFields("remarksdetail", "t4.remarks");
         querySQL.addQueryFields("reasondetail", "t4.reason");
+        querySQL.addQueryFields("incheckdate", "t5.checkdate");
+        querySQL.addQueryFields("outcheckdate", "t6.checkdate");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sa_aftersalesmagid", sa_aftersalesmagid);
         Rows rows = querySQL.query();
@@ -370,14 +379,24 @@ public class aftersalesmag extends Controller {
             }
         }
 
+        QuerySQL t5 = SQLFactory.createQuerySQL(this, "st_stockbill_items_sku", "sku").setTableAlias("t1");
+        t5.addJoinTable(JOINTYPE.inner, "st_stockbill", "t2", "t2.st_stockbillid=t1.st_stockbillid", "st_stockbillid", "checkdate");
+        t5.setWhere("t2.type='返修入库' and t2.status = '审核'");
+
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_aftersalesmag", "*");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid", "enterprisename", "abbreviation");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.sys_enterpriseid = t3.sys_enterpriseid AND t1.siteid = t3.siteid", "agentnum");
         querySQL.addJoinTable(JOINTYPE.left, "sa_aftersalesmag_items", "t4", "t1.sa_aftersalesmagid = t4.sa_aftersalesmagid AND t1.siteid = t4.siteid", "name", "phonenumber", "address",
                 "stockdate", "enddate", "model", "unitname", "itemname", "itemno", "duty", "demand", "machinecode", "qty", "itemid");
+
+        querySQL.addJoinTable(JOINTYPE.left, t5, "t5", "t5.sku=t4.machinecode");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_sendrepair", "t6", "t6.sourcetable='st_stockbill' and t6.sourceid=t5.st_stockbillid");
+
         querySQL.addQueryFields("remarksdetail", "t4.remarks");
         querySQL.addQueryFields("reasondetail", "t4.reason");
+        querySQL.addQueryFields("incheckdate", "t5.checkdate");
+        querySQL.addQueryFields("outcheckdate", "t6.checkdate");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
         querySQL.setWhere("t1.createflag=1 or t1.status !='新建'");

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

@@ -710,7 +710,7 @@ public class OrderItemsHelper extends BaseClass {
 
     public UpdateSQL getUpdateSQL(long sa_orderitemsid, JSONObject item, Row itemRow, String type, BigDecimal defaultprice, BigDecimal price, BigDecimal saleprice, long width, long length) throws YosException {
         BigDecimal qty = item.getBigDecimal("qty");
-
+        Long itemid = item.getLong("itemid");
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(controller, sa_orderitems);
         //订购数量
         updateSQL.setValue("qty", qty);
@@ -719,7 +719,7 @@ public class OrderItemsHelper extends BaseClass {
         if (conversionrate.compareTo(BigDecimal.ZERO) <= 0) {
             conversionrate = BigDecimal.valueOf(1);
         }
-        updateSQL.setValue("itemid", item.getLongValue("itemid"));
+        updateSQL.setValue("itemid", itemid);
         updateSQL.setValue("itemno", itemRow.getString("itemno"));
         updateSQL.setValue("itemname", itemRow.getString("itemname"));
         updateSQL.setValue("model", itemRow.getString("model"));
@@ -792,6 +792,20 @@ public class OrderItemsHelper extends BaseClass {
 
         updateSQL.setValue("length", length);
 
+
+        if (type.equals("配件订单") && StringUtils.isNotBlank(item.getStringValue("cardno"))) {
+            Rows aftersalesbomrows = dbConnect.runSqlQuery("select t2.sa_aftersalesbomid from sa_warrantycard t1 inner join sa_aftersalesbom_items t2 on t1.itemid=t2.itemid inner join sa_aftersalesbom t3 on t2.sa_aftersalesbomid=t3.sa_aftersalesbomid where t1.cardno='" + item.getStringValue("cardno") + "' and t3.status='审核'");
+            if (aftersalesbomrows.isNotEmpty() && (controller.usertype == 21 || controller.usertype == 22)) {
+                Rows aftersalesbompjrows = dbConnect.runSqlQuery("select qty from sa_aftersalesbom_pjs t1 where t1.sa_aftersalesbomid=" + aftersalesbomrows.get(0).getString("sa_aftersalesbomid") + " and t1.itemid=" + itemid);
+                if (aftersalesbompjrows.isNotEmpty()) {
+                    updateSQL.setValue("canoffqty", aftersalesbompjrows.get(0).getBigDecimal("qty").compareTo(qty) > 0 ? qty : aftersalesbompjrows.get(0).getBigDecimal("qty"));
+                } else {
+                    updateSQL.setValue("canoffqty", 1);
+                }
+            }
+        }
+
+
         updateSQL.setWhere("siteid", controller.siteid);
         updateSQL.setWhere("sa_orderitemsid", sa_orderitemsid);
 

src/custom/restcontroller/webmanage/sale/salestarget/SQL/企业-业绩目标完成列表.sql

@@ -7,6 +7,7 @@ SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
                 t2.agentnum,
                 t1.enterprisename,
+                t1.abbreviation,
                 m1.target_l + m2.target_l + m3.target_l + m4.target_l  y1l,
                 m1.target_h + m2.target_h + m3.target_h + m4.target_h y1h,
                 m1.target_l s1l,
@@ -25,6 +26,6 @@ from sa_salestarget m
          LEFT JOIN sys_enterprise t1 on t1.sys_enterpriseid=m.sys_enterpriseid
          LEFT JOIN sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid
         where $where1$
-ORDER BY m.year desc
+
 
 

src/custom/restcontroller/webmanage/sale/salestarget/enterprisetarget.java

@@ -183,6 +183,11 @@ public class enterprisetarget extends Controller {
                     where1.append(" t1.enterprisename like '%").append(content_where.getJSONObject("tablefilter").getStringValue("enterprisename")).append("%' ");
                     where1.append(")");
                 }
+                if(StringUtils.isNotBlank(content_where.getJSONObject("tablefilter").getStringValue("abbreviation"))){
+                    where1.append(" and(");
+                    where1.append(" t1.abbreviation like '%").append(content_where.getJSONObject("tablefilter").getStringValue("abbreviation")).append("%' ");
+                    where1.append(")");
+                }
             }
         }
 

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

@@ -20,7 +20,8 @@ SELECT
     t12.sys_enterpriseid sys_enterpriseid_initiate,
     t12.agentnum agentnum_initiate,
     t12.enterprisename enterprisename_initiate,
-    t12.abbreviation abbreviation_initiate
+    t12.abbreviation abbreviation_initiate,
+    t13.`name` submitname
 FROM
     sa_serviceorder t1
         LEFT JOIN sys_enterprise t2 ON t1.sys_enterpriseid = t2.sys_enterpriseid
@@ -37,4 +38,5 @@ FROM
         left join sa_workorder t10 on t10.sa_serviceorderid=t1.sa_serviceorderid and t10.siteid=t1.siteid and t10.status !='作废'
         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 sys_users t13 ON t13.accountno=t1.submitby
 where t1.siteid=$siteid$ and $where$

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

@@ -356,7 +356,7 @@ public class workorder extends Controller {
         RowsMap workorderteamRowsMap = workorderteamRows.toRowsMap("ownerid");
 
         /** 工单节点物料查询 **/
-        Rows workorderitemRows = dbConnect.runSqlQuery("select t1.*,t2.itemno,t2.model,t2.itemname,t2.spec,t7.bomfullname,ifnull(t1.isnew,0) isnew from sa_workorder_node_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid " + "LEFT JOIN sa_itemsalebom t6 on t1.itemid=t6.itemid and t6.siteid = t1.siteid " + "LEFT JOIN plm_bom t7 on t7.plm_bomid=t6.plm_bomid and t6.siteid = t7.siteid where t1.sa_workorderid=" + sa_workorderid + " and t1.siteid='" + siteid + "'");
+        Rows workorderitemRows = dbConnect.runSqlQuery("select t1.*,t2.marketprice,t2.itemno,t2.model,t2.itemname,t2.spec,t7.bomfullname,ifnull(t1.isnew,0) isnew from sa_workorder_node_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid " + "LEFT JOIN sa_itemsalebom t6 on t1.itemid=t6.itemid and t6.siteid = t1.siteid " + "LEFT JOIN plm_bom t7 on t7.plm_bomid=t6.plm_bomid and t6.siteid = t7.siteid where t1.sa_workorderid=" + sa_workorderid + " and t1.siteid='" + siteid + "'");
         // 默认商品图片
         Rows defaultImageRows = beans.Item.Item.getItemdefaultImage(this);
         // 附件
@@ -1483,7 +1483,15 @@ public class workorder extends Controller {
         if (aftersalesbomitemsrows.isNotEmpty()) {
             sa_aftersalesbomid = aftersalesbomitemsrows.get(0).getLong("sa_aftersalesbomid");
         }
-        return getSucReturnObject().setData(sa_aftersalesbomid).toString();
+
+        Row row = new Row();
+        row.put("sa_aftersalesbomid", sa_aftersalesbomid);
+        Rows rows = dbConnect.runSqlQuery("select createdate  from sa_itemsku where  sku='" + sku + "' ");
+        if (rows.isNotEmpty()) {
+            row.put("skucreatedate", rows.get(0).getString("createdate"));
+        }
+        row.putIfAbsent("skucreatedate", "");
+        return getSucReturnObject().setData(row).toString();
     }
 
     @API(title = "配件列表查询", apiversion = R.ID2025080610425103.v1.class)

src/resources/application.yaml

@@ -10,6 +10,6 @@ system:
     driver: "com.mysql.cj.jdbc.Driver"
     username: "root"
     password: "root"
-    url: "jdbc:mysql://localhost:2206/mdyos"
+    url: "jdbc:mysql://localhost:3306/mdyos"
     #url: jdbc:mysql://host.docker.internal:3306/yos3
     servicename: "mysql80"