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

WMS bug HL-6227：线边报废筛选功能,创建时间条件未生效
1 changed files with 1 additions and 1 deletions
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionscrapRecord/ProductionscrapRecordDetailMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionscrapRecord/ProductionscrapRecordDetailMapper.java
@ -93,7 +93,7 @@ public interface ProductionscrapRecordDetailMapper extends BaseMapperX<Productio
        QueryWrapper<ProductionscrapRecordDetailDO> queryWrapper = QueryWrapperUtils.structureFilter(conditions,excludeConditions);
        queryWrapper.orderByDesc("create_time");
        if (conditions.getFilters() != null) {
-            String mainSql = QueryWrapperUtils.buildMainSql("record_productionreturn_main", excludeConditions, conditions);
+            String mainSql = QueryWrapperUtils.buildMainSql("record_productionscrap_main", excludeConditions, conditions);
            if (!mainSql.isEmpty()) {
                queryWrapper.inSql("master_id", mainSql);
            }
Author	SHA1	Message	Date
高竟松	a7c9ba0e8f	Merge remote-tracking branch 'origin/master_hella' into master_hella	10 months ago
高竟松	73927790fd	WMS bug HL-6227：线边报废筛选功能,创建时间条件未生效	10 months ago