From 900ceb3b7dd86ceaed5749db1dd0435605870ac6 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, 5 Aug 2021 09:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90-=E8=B7=B3=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=92=8C=E5=85=B6=E4=BB=96=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=E9=97=AE=E9=A2=98=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java  | 4 ++--
 .../com/foreverwin/mesnac/common/service/AnomalyService.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
index 77c72f39..519f7e26 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
@@ -758,7 +758,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     @Override
     public void createAnomalyTask(String category, String resource, String shopOrder,
                                   String sfc, String ncCodes,String position,String ncQty,
-                                  String ncDescription,String userGroup) {
+                                  String ncDescription,String userGroup,String remark) {
         String site = CommonMethods.getSite();
         LocalDateTime now = LocalDateTime.now();
         String user = CommonMethods.getUser();
@@ -767,7 +767,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         AbnormalBill abnormalBill = new AbnormalBill();
         if(Constants.ABNORMAL_RESRCE.equals(category)){
             abnormalNo = this.getNextNumber(category);
-
             abnormalBill.setNcCode(ncCodes);
             abnormalBill.setRepairDateTime(now);
             abnormalBill.setType(category);
@@ -782,6 +781,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBill.setStatus(Constants.NEW);
         abnormalBill.setSfc(sfc);
         abnormalBill.setShopOrder(shopOrder);
+        abnormalBill.setPbDescription(remark);
         //根据工单找itemBo，并放到异常单里面
         if(shopOrder != null ){
             ShopOrder shopOrder1 = shopOrderMapper.selectById(HandleEnum.SHOP_ORDER.getHandle(site, shopOrder));
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
index 8952f968..6584a38c 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/AnomalyService.java
@@ -23,7 +23,7 @@ public interface AnomalyService {
 
     void createAnomalyTask(String category, String resource, String shopOrder,
                            String sfc, String ncCodes,String position,String ncQty,
-                           String ncDescription,String userGroup);
+                           String ncDescription,String userGroup,String remark);
 
     /**
      * 判断产品条码在质量异常中是否为报废