From cfd7e504f21b888b68b8c93e56b2343a7842d0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Thu, 29 Jul 2021 15:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E8=87=AA?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AbnormalBillController.java    |  7 +++++
 .../mesnac/meapi/dto/NcCodeDto.java           | 31 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/NcCodeDto.java

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index db7f0d2d..954f26c6 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -342,11 +342,18 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.anomalyReveseRepair(abnormalBill,abnormalBillDispose));
     }
 
+    /**
+     * 生产报废检索功能
+     * @param site
+     * @param sfc
+     * @return
+     */
     @GetMapping("/getScrapDtoBysfc")
     public R getScrapDtoBysfc(String site,String sfc){
         return R.ok(productionScrap.getScrapDtoBysfc(site,sfc));
     }
 
+
     @GetMapping("/findNcCodeDescriptionByNcCode")
     public R findNcCodeDescriptionByNcCode(String ncCode){
         return R.ok(ncCodeService.findNcCodeDescriptionByNcCode(ncCode));
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/NcCodeDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/NcCodeDto.java
new file mode 100644
index 00000000..eb1c5b2b
--- /dev/null
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/NcCodeDto.java
@@ -0,0 +1,31 @@
+package com.foreverwin.mesnac.meapi.dto;
+
+import com.foreverwin.mesnac.meapi.model.NcCode;
+
+/**
+ * @Description TODO
+ * @Author zhaojiawei
+ * @Since 2021-07-29
+ */
+public class NcCodeDto extends NcCode {
+
+    private String ngGroup;
+
+    private String ngDescription;
+
+    public String getNgGroup() {
+        return ngGroup;
+    }
+
+    public void setNgGroup(String ngGroup) {
+        this.ngGroup = ngGroup;
+    }
+
+    public String getNgDescription() {
+        return ngDescription;
+    }
+
+    public void setNgDescription(String ngDescription) {
+        this.ngDescription = ngDescription;
+    }
+}