diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
index 1da3e86a..ed9c5aa4 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
+++ b/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}
- 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}%')
@@ -41,6 +41,9 @@
and st_ivt_iostorinv.source_form_code = #{query.source_form_code}
+
+ and st_ivt_iostorinv.create_time >= #{query.start_time} and st_ivt_iostorinv.update_time <= #{query.end_time}
+
GROUP BY st_ivt_iostorinv.id order by st_ivt_iostorinv.id desc
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java
index 4336626c..6cdc4496 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/SyncErpBillsScheduleService.java
+++ b/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 list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper().in(SyncFormMapping::getForm_type, "BD_MATERIAL"));
+ // List list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper().in(SyncFormMapping::getForm_type, "ka7c19edf9d4b4b39b8cc4a06802163b0"));
List strucList = bmFormStrucServiceImpl.list(new LambdaQueryWrapper().eq(BmFormStruc::getIs_sync, "1"));
Set structSet = strucList.stream().map(BmFormStruc::getForm_type).collect(Collectors.toSet());
List list = syncFormMappingServiceImpl.list(new LambdaQueryWrapper().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 + "'";
@@ -232,7 +232,7 @@ public class SyncErpBillsScheduleService {
filterString += "AND FDocumentStatus = 'C' AND F_PMSY_BillStatus = 'A' AND F_PMSY_CreateDate >= '" + timeStart + " 00:00:00' AND F_PMSY_CreateDate <= '" + timeEnd + " 23:59:59' ";
} else if ("SAL_SaleOrder".equals(formType)) {
filterString += " AND FDocumentStatus = 'C' AND FCloseStatus ='A' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' ";
- } else if ("STK_TransferDirect".equals(formType)||"STK_MisDelivery".equals(formType)||"PUR_MRB".equals(formType)||"SAL_RETURNSTOCK".equals(formType)) {
+ } else if ("STK_TransferDirect".equals(formType) || "STK_MisDelivery".equals(formType) || "PUR_MRB".equals(formType) || "SAL_RETURNSTOCK".equals(formType)) {
filterString += " AND FDocumentStatus ='B' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' ";
} else {
filterString += " AND FDocumentStatus = 'C' AND FCreateDate >= '" + timeStart + " 00:00:00' and FCreateDate <= '" + timeEnd + " 23:59:59' ";
diff --git a/wms_pro/qd/src/views/wms/stor_manage/record/index.vue b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue
index 2d8b541a..a00e004d 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/record/index.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/record/index.vue
@@ -20,6 +20,39 @@
class="filter-item"
/>
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
- {{scope.row.growth}}
+ {{ scope.row.growth }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
{{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
-
+
@@ -80,14 +113,14 @@
-
+