From 8b9f69fa43352d7cee6497c00222f1a47454d3af Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 6 Mar 2024 14:16:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 6024921086..7fd3a1be96 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2251,6 +2251,14 @@ public class BusSalesOrderService extends MybatisBaseService crmCustomerTempInfoVoResultBean = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(dto.getCustomerSid()); From 2c39be5b1d6359979682b6f6b1ba2371895a7eff Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 6 Mar 2024 14:48:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml | 2 +- .../com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml | 2 +- .../api/bussalesorder/app/order/AppBusSalesOrderAllDto.java | 2 +- .../api/autoservice/saleOrders/order/BusOrerSalesAllDto.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index 46c4887817..ad3397d477 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -605,7 +605,7 @@ AND bv.modelConfigSid = bvc.configurationItemsSid and (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入') AND bv.lockedState = #{lockedStateKey} - and bv.useOrgSid = #{orgSid} and bv.isProblemVeh = '0') AS nowCarNum, + and bv.useOrgSid = #{orgSid} and bv.isProblemVeh = '0' and length(bv.vinNo)>8) AS nowCarNum, (select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 55335e4c95..3719c0696c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -720,7 +720,7 @@ OR bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入') AND lockedState = #{lockedStateKey} - AND bv.useOrgSid = #{useOrgSid} and bv.isProblemVeh = '0') AS nowCarNum, + AND bv.useOrgSid = #{useOrgSid} and bv.isProblemVeh = '0' and length(bv.vinNo)>8) AS nowCarNum, (select SUM(cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseApplyMediumModelSid = bd.sid diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java index fda8426d21..f217bc2738 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java @@ -44,7 +44,7 @@ public class AppBusSalesOrderAllDto implements Dto { @NotBlank(message = "参数错误：客户sid不能为空") private String customerSid; @ApiModelProperty("挂靠公司类型 1 选择 0 手写") - @NotBlank(message = "参数错误：挂靠公司类型不能为空") +// @NotBlank(message = "参数错误：挂靠公司类型不能为空") private String affiliatedType; @ApiModelProperty("选择挂靠公司名称") private String affiliatedOrgNameChoose; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java index 6450d38edf..1b5100350a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrerSalesAllDto.java @@ -49,7 +49,7 @@ public class BusOrerSalesAllDto implements Dto { @NotBlank(message = "参数错误：客户sid不能为空") private String customerSid; @ApiModelProperty("挂靠公司类型 1 选择 0 手写") - @NotBlank(message = "参数错误：挂靠公司类型不能为空") +// @NotBlank(message = "参数错误：挂靠公司类型不能为空") private String affiliatedType; @ApiModelProperty("选择挂靠公司名称") private String affiliatedOrgNameChoose; From f68a039a5c43170b5eda74c41977df45d91a43c7 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 6 Mar 2024 15:25:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue index 04f1b1a3aa..599d8affcc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue @@ -166,7 +166,7 @@ - 内部编码： + 厂家开票日期： {{ temp.manDate }} From efb51ebdd78a989c976a410b1ac6b18753929a68 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 6 Mar 2024 16:14:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=85=E4=BA=A4?= =?UTF-8?q?=E8=BD=A6=E7=B4=AF=E8=AE=A1=E5=8E=BB=E9=99=A4=E5=B7=B2=E9=80=80?= =?UTF-8?q?=E8=BD=A6=E7=9A=84=E8=BD=A6=E8=BE=86=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/databases/统计报表更新.sql | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql index 73b962fe7d..60fa3df14a 100644 --- a/doc/databases/统计报表更新.sql +++ b/doc/databases/统计报表更新.sql @@ -283,7 +283,7 @@ BEGIN WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();*/ UPDATE daily_report r - INNER JOIN (select (b.scount - b.ssscount) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid + INNER JOIN (select (b.scount - b.ssscount-b.ssscount1) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid from (SELECT a.scount, a.useOrgSid, a.modelConfigSid, @@ -293,11 +293,23 @@ BEGIN LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid + left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid WHERE bo.nodeState = '已办结' - AND bv.vehicleState = '0002' + AND (bv.vehicleState = '0002' or bs.busNo = '602') and bo.useOrgSid = a.useOrgSid and bm.modelSid = a.modelSid - and bm.modelConfigSid = a.modelConfigSid) as ssscount + and bm.modelConfigSid = a.modelConfigSid) as ssscount, + (SELECT count(bov.id) AS scount + FROM anrui_base.base_vehicle bv + LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid + LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid + LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid + left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid + WHERE bo.nodeState = '已办结' + AND bs.busState = '602' + and bo.useOrgSid = a.useOrgSid + and bm.modelSid = a.modelSid + and bm.modelConfigSid = a.modelConfigSid) as ssscount1 FROM ( SELECT count(bov.id) AS scount, bo.useOrgSid,