From 7fc20d0919106a3b4a5d1e79efdbfc232c9fc8f4 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 22 Oct 2024 10:02:03 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E8=A7=A3=E5=86=B3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml   | 2 +-
 .../inventory/wmsinventoryrecord/WmsInventoryRecordService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
index 7cfe249cb6..ce8be2c19a 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
@@ -101,7 +101,7 @@
                DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime,
                wir.busTypeValue,
                wir.batchNumber,
-               wir.billObjName,
+               wir.manufacturerName billObjName,
                wir.currentCount,
                wir.count,
                wir.unit,
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
index 1f29dab00b..8ceebc1be0 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
@@ -251,7 +251,7 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         }
         //客户/供应商名称
         if (StringUtils.isNotBlank(query.getBillObjName())) {
-            qw.like("wir.billObjName", query.getBillObjName());
+            qw.like("wir.manufacturerName", query.getBillObjName());
         }
         //批次号
         if (StringUtils.isNotBlank(query.getBatchNumber())) {

From c3041b6ab2ad0267d820ae605ab354b484c06ef9 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 22 Oct 2024 10:18:00 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E8=A7=A3=E5=86=B3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=992?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wmsinventoryrecord/WmsInventoryRecordService.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
index 8ceebc1be0..35c92a3d53 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java
@@ -276,8 +276,10 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw);
         for (WmsInventoryRecordsVo record : pagging.getRecords()) {
-            SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData();
-            record.setCreateByName(sysUserVo.getName());
+            if (StringUtils.isNotBlank(record.getCreateBySid())) {
+                SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData();
+                record.setCreateByName(sysUserVo.getName());
+            }
         }
         PagerVo<WmsInventoryRecordsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

From fa6075763c26236ca14a4726021efc07d8e6b5ce Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 22 Oct 2024 11:02:49 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86=E6=9F=A5=E7=9C=8B=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
index b62487e229..ff6da2e0b3 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
@@ -22,7 +22,7 @@
 		FROM
 			as_customer_vehicle
 		WHERE
-			customerSid = #{sid}
+			customerSid = #{sid} and isDelete = 0
 	</select>
     <select id="customerList" resultType="com.yxt.anrui.as.api.ascustomervehicle.AsCustomerCrmVehVo">
 		SELECT

From 04bda263cefda5f48ab93a68cb5ac9c062f17f2f Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 22 Oct 2024 11:05:36 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86=E6=9F=A5=E7=9C=8B=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsCustomervehMaintenanceMapper.java                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java
index 1a6688562b..79e7d4af2f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java
@@ -64,6 +64,6 @@ public interface AsCustomervehMaintenanceMapper extends BaseMapper<AsCustomerveh
 	@Select("select * from as_customerveh_maintenance where vehSid =#{vehSid}")
     AsCustomervehMaintenance fetchByVehSid(@Param("vehSid") String vehSid);
 
-	@Update("update as_customerveh_maintenance set isDelete = '1' where vehSid =#{vehSid}")
+	@Delete("delete from as_customerveh_maintenance where vehSid =#{vehSid}")
 	void delByVehSid(@Param("vehSid") String vehSid);
 }

From 556f634c78b08a3476e092a348cfc334a1b58a7c Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 22 Oct 2024 11:13:41 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=BD=A6=E8=BE=86=E6=9F=A5=E7=9C=8B=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=983?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index 398a315483..a359d2a8ff 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -317,8 +317,8 @@
         '1'
         ELSE '1'
         END as isFilingIndate,
-            (SELECT COUNT(*) FROM yxt_4sas.as_customer_vehicle as v WHERE v.customerSid = a.sid) as vehCount,
-        (SELECT COUNT(*) FROM crm_docking_people as d WHERE d.customerSid = a.sid) as personCount
+            (SELECT COUNT(*) FROM yxt_4sas.as_customer_vehicle as v WHERE v.customerSid = a.sid and v.isDelete = 0) as vehCount,
+        (SELECT COUNT(*) FROM crm_docking_people as d WHERE d.customerSid = a.sid and d.isDelete = 0) as personCount
         FROM
             crm_customer_temp AS a
                 LEFT JOIN anrui_portal.sys_organization as s on a.useOrgSid = s.sid