update - 生产报表

aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml

@@ -118,7 +118,7 @@
             <if test="saleOrderCode != null">#{saleOrderCode},</if>
             <if test="saleorderLinenumber != null">#{saleorderLinenumber},</if>
             <if test="materialCode != null">#{materialCode},</if>
-            <if test="materialName != null">#{materialName},</if>
+            <if test="materialName != null">#{materialName,jdbcType=NVARCHAR},</if>
             <if test="productLineCode != null">#{productLineCode},</if>
             <if test="planAmount != null">#{planAmount},</if>
             <if test="completeAmount != null">#{completeAmount},</if>

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<HashMap<String, Object>> list = productionReportService.ScanOfflineRecordReportList(hashMap);
+        return success(list);
+    }
+
 }

aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java

@@ -64,4 +64,11 @@ public interface GeneralReportMapper {
      * @return
      */
     List<HashMap<String, Object>> productTraceabilityReportList(Map hashMap);
+
+    /**
+     * 扫描下线记录报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> ScanOfflineRecordReportList(Map hashMap);
 }

aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java

@@ -35,4 +35,11 @@ public interface IProductionReportService
      * @return
      */
     List<HashMap<String, Object>> WIPInquiryReportList(Map hashMap);
+
+    /**
+     * 扫描下线记录报表
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> ScanOfflineRecordReportList(Map hashMap);
 }

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<HashMap<String, Object>> ScanOfflineRecordReportList(Map hashMap) {
+        return reportMapper.ScanOfflineRecordReportList(hashMap);
+    }
+
 
 }

aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml

@@ -62,6 +62,10 @@
         SELECT *
         FROM VIEW_MATERIAL_COMPLETION
     </select>
+    <select id="ScanOfflineRecordReportList" resultType="java.util.HashMap">
+        SELECT *
+        FROM VIEW_PRODUCT_OFFLINE
+    </select>
 
 
 </mapper>