diff --git a/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml b/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml
index 50a86ed..e1b9592 100644
--- a/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml
+++ b/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml
@@ -118,7 +118,7 @@
#{saleOrderCode},
#{saleorderLinenumber},
#{materialCode},
- #{materialName},
+ #{materialName,jdbcType=NVARCHAR},
#{productLineCode},
#{planAmount},
#{completeAmount},
diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
index 9b6afc3..24b198c 100644
--- a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
+++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
@@ -51,4 +51,13 @@ public class ProductionReportController extends BaseController {
return success(list);
}
+ /**
+ * 扫描下线记录报表
+ */
+ @GetMapping("/ScanOfflineRecordReportList")
+ public AjaxResult ScanOfflineRecordReportList(@RequestParam(required = false) Map hashMap) {
+ List> list = productionReportService.ScanOfflineRecordReportList(hashMap);
+ return success(list);
+ }
+
}
diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java
index 7dbe2b5..37126d3 100644
--- a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java
+++ b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java
@@ -64,4 +64,11 @@ public interface GeneralReportMapper {
* @return
*/
List> productTraceabilityReportList(Map hashMap);
+
+ /**
+ * 扫描下线记录报表
+ * @param hashMap
+ * @return
+ */
+ List> ScanOfflineRecordReportList(Map hashMap);
}
diff --git a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
index 9d5f2c4..ea179ac 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
@@ -35,4 +35,11 @@ public interface IProductionReportService
* @return
*/
List> WIPInquiryReportList(Map hashMap);
+
+ /**
+ * 扫描下线记录报表
+ * @param hashMap
+ * @return
+ */
+ List> ScanOfflineRecordReportList(Map hashMap);
}
diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java
index 12ace3a..b0819a4 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java
@@ -49,5 +49,15 @@ public class ProductionReportServiceImpl implements IProductionReportService {
return reportMapper.WIPInquiryReportList(hashMap);
}
+ /**
+ * 扫描下线记录报表
+ * @param hashMap
+ * @return
+ */
+ @Override
+ public List> ScanOfflineRecordReportList(Map hashMap) {
+ return reportMapper.ScanOfflineRecordReportList(hashMap);
+ }
+
}
diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index e08fa52..89312d3 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -62,6 +62,10 @@
SELECT *
FROM VIEW_MATERIAL_COMPLETION
+