2
0

2 Коммитууд d4907cab05 ... 5aec8b6f23

Эзэн SHA1 Мессеж Огноо
  林豪 左 5aec8b6f23 Merge branch 'master' of http://120.77.11.229:3000/ZTGT/PT-HJ-CP-WMS 2 сар өмнө
  林豪 左 733a0822fb 修正超限判断逻辑并新增称重请求类 2 сар өмнө

+ 42 - 0
wms.dto/request/cp/WeighingResultRequest.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace wms.dto.request.cp
+{
+    /// <summary>
+    /// 称重结果请求
+    /// </summary>
+    public class WeighingResultRequest
+    {
+        /// <summary>
+        /// 仓库
+        /// </summary>
+        public string WareHouse { get; set; }
+
+        /// <summary>
+        /// 标准重量
+        /// </summary>
+        public decimal StandardWeight { get; set; }
+
+        /// <summary>
+        /// 称重重量
+        /// </summary>
+        public decimal MeasuredWeight { get; set; }
+
+        /// <summary>
+        /// 偏差上限
+        /// </summary>
+        public decimal UpperDeviationLimit { get; set; }
+
+        /// <summary>
+        /// 偏差下限
+        /// </summary>
+        public decimal LowerDeviationLimit { get; set; }
+
+        /// <summary>
+        /// 是否超限
+        /// </summary>
+        public bool IsOutOfTolerance { get; set; }
+    }
+}

+ 1 - 1
wms.service/Service/CPService.cs

@@ -4988,7 +4988,7 @@ namespace wms.service.Service
                     StandardWeight = stock.TolWQty,
                     UpperDeviationLimit = Convert.ToDecimal(config.Default1),
                     LowerDeviationLimit = Convert.ToDecimal(config.Default2),
-                    IsOutOfTolerance = request.Weight < upperDeviationLimit && request.Weight > lowerDeviationLimit ? true : false
+                    IsOutOfTolerance = request.Weight < upperDeviationLimit || request.Weight > lowerDeviationLimit ? true : false
                 };
                 _baseWeighingResult.InsertReturnEntity(weighingResult);
                 //上安灯系统