From 40c3f0dcbd1565242b5c5148c4a2197d2bdcc733 Mon Sep 17 00:00:00 2001
From: DOUDOU <877258667@qq.com>
Date: Mon, 14 Nov 2022 17:27:20 +0800
Subject: [PATCH] =?UTF-8?q?2022-11-14=20=E6=A0=A1=E9=AA=8C=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=8D=B7=E7=9A=84=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/service/impl/ScheduleServiceImpl.java | 7 +++++++
 src/main/resources/application-dev.yml                     | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 08bf747..96573ce 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -2038,6 +2038,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
 
         //4.调用存储过程 上机的主材依次校验
+        String createNewRollFlag = pageData.getCreateNewRollFlag();
         //先循环验证参数是否符合规则
         for (int i = 0; i < sfdcMaterialList.size(); i++) {
             SfdcMaterialData sfdcMaterialData = sfdcMaterialList.get(0);
@@ -2054,6 +2055,12 @@ public class ScheduleServiceImpl implements ScheduleService {
             if (netIssueQty > transQty) {
                 throw new XJException("材料上本卷耗用数量大于发料数量!");
             }
+            //判断是否是正常的报工
+            if("N".equalsIgnoreCase(createNewRollFlag) && itemNo > 10){
+                if (netIssueQty.floatValue() != transQty.floatValue()) {
+                    throw new XJException("正常结束卷时,主材必须完全耗用!");
+                }
+            }
             //调用存储过程校验每一个卷的数量
             Map<String, Object> resultMap = this.checkFinishRollWithSfdcMaterialHist(site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo, username);
             //区分是否抛出异常的信息
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f4cb583..7dc9eb4 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -29,12 +29,17 @@ spring:
         #login-password: admin
       filter:
         stat:
+          enabled: true
           log-slow-sql: true
           slow-sql-millis: 1000
           merge-sql: false
         wall:
           config:
             multi-statement-allow: true
+      web-stat-filter:
+        url-pattern: /*
+        exclusions: "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*"
+        session-stat-enable: true
 
 
 ##多数据源的配置