更新报工

admin/src/main/resources/application-dev.yml

@@ -56,9 +56,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3307/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://192.168.222.136:3306/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: admin
+        password: t0psunit
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

admin/src/main/resources/application-test.yml

@@ -221,9 +221,6 @@ remote:
     url: http://localhost:20090
     username: rest_user
     password: ximai123456
-
-
-
 #fiegn配置连接池
 feign:
   okhttp:

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -774,8 +774,11 @@ public class ProTaskServiceImpl implements IProTaskService {
         BigDecimal feedbackQualifyConst = feedback.getQuantityQualify();
         BigDecimal fuantityUnqualify = feedback.getQuantityUnqualify();
         //温志超修改 ：合格和非合格数量都不允许小于0
-        ExceptionUtil.checkTrueThrowException(feedbackQualifyConst.compareTo(BigDecimal.ZERO) <= 0 || fuantityUnqualify.compareTo(BigDecimal.ZERO) <= 0,
-                MessageUtils.message("pro.feedback.error.min.quantity、unqualify"));
+        ExceptionUtil.checkTrueThrowException( (feedbackQualifyConst.compareTo(BigDecimal.ZERO) < 0 || fuantityUnqualify.compareTo(BigDecimal.ZERO) < 0),
+                MessageUtils.message("pro.feedback.error.min.quantity"));
+
+        ExceptionUtil.checkTrueThrowException((feedbackQualifyConst.compareTo(BigDecimal.ZERO) <= 0 && fuantityUnqualify.compareTo(BigDecimal.ZERO) <= 0),
+                MessageUtils.message("报工数目合格、不合格数不能都小于等于0"));
         if(StringUtils.isNotEmpty(feedback.getQrcode())){
             FeedbackValidateSerialNoParams feedbackValidateSerialNoParams = new FeedbackValidateSerialNoParams();
             feedbackValidateSerialNoParams.setQrcode(feedback.getQrcode());