opt:修复出入库单据查询时间范围问题；增加物料查；修复ERP单据同步时间范围问题；

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml

@@ -32,7 +32,7 @@
                 and st_ivt_iostorinvdtl.vehicle_code = #{query.vehicles}
             </if>
             <if test="query.material != null and query.material != ''">
-                and (md_me_materialbase.material_spec LIKE '%${query.material}%'
+                and (md_me_materialbase.material_code LIKE '%${query.material}%'
                 or md_me_materialbase.material_name LIKE '%${query.material}%')
             </if>
             <if test="query.product_code != null and query.product_code != ''">
@@ -41,6 +41,9 @@
             <if test="query.source_form_code != null and query.source_form_code != ''">
                 and st_ivt_iostorinv.source_form_code = #{query.source_form_code}
             </if>
+            <if test="query.start_time != null and query.start_time != '' and query.end_time != null and query.end_time != ''">
+                and st_ivt_iostorinv.create_time &gt;= #{query.start_time} and st_ivt_iostorinv.update_time &lt;= #{query.end_time}
+            </if>
         </where>
         GROUP BY st_ivt_iostorinv.id order by st_ivt_iostorinv.id desc
     </select>

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java

@@ -106,7 +106,7 @@ public class SyncErpBillsScheduleService {
             MDC.put("requestIp", "127.0.0.1");
             MDC.put("requestTime", DateUtil.now());
             LuceneAppender.traceIdTL.set(BaseCode.intToChars(IdUtil.getLongId()));
-            //List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "BD_MATERIAL"));
+            // List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0"));
             List<BmFormStruc> strucList = bmFormStrucServiceImpl.list(new LambdaQueryWrapper<BmFormStruc>().eq(BmFormStruc::getIs_sync, "1"));
             Set<String> structSet = strucList.stream().map(BmFormStruc::getForm_type).collect(Collectors.toSet());
             List<SyncFormMapping> list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper<SyncFormMapping>().in(SyncFormMapping::getForm_type, structSet));
@@ -194,7 +194,7 @@ public class SyncErpBillsScheduleService {
                     timeStart = start;
                     timeEnd = end;
                 }
-                String filterString = getFilterString(formType, code, timeEnd, timeStart);
+                String filterString = getFilterString(formType, code, timeStart, timeEnd);
                 ErpQuery query = new ErpQuery();
                 query.setFilterString(filterString);
                 query.setFormId(formType);
@@ -222,7 +222,7 @@ public class SyncErpBillsScheduleService {
         }
     }
 
-    private static String getFilterString(String formType, String code, String timeEnd, String timeStart) {
+    private static String getFilterString(String formType, String code, String timeStart, String timeEnd) {
         String filterString;
         if (StringUtils.isNotBlank(code)) {
             filterString = "FBillNo = '" + code + "'";

wms_pro/qd/src/views/wms/stor_manage/record/index.vue

@@ -20,6 +20,39 @@
             class="filter-item"
           />
         </el-form-item>
+        <el-form-item label="物料编码">
+          <el-input
+            v-model="query.material_code"
+            clearable
+            style="width: 300px"
+            size="mini"
+            placeholder="请输入物料编码"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
+        <el-form-item label="载具编码">
+          <el-input
+            v-model="query.vehicle_code"
+            clearable
+            style="width: 300px"
+            size="mini"
+            placeholder="请输入载具编码"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
+        <el-form-item label="批次">
+          <el-input
+            v-model="query.pcsn"
+            clearable
+            style="width: 300px"
+            size="mini"
+            placeholder="请输入批次信息"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
         <el-form-item label="变动日期" prop="analyseData">
           <el-date-picker
             v-model="query.datepick"