Merge remote-tracking branch 'origin/master'

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

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

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);
 }

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,

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())) {
@@ -276,9 +276,11 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw);
         for (WmsInventoryRecordsVo record : pagging.getRecords()) {
+            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;
     }