From b532ba8806996246ab7a0896bf34b884c47dee7e Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期二, 14 四月 2026 14:06:25 +0800
Subject: [PATCH] 试生产版本
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/AddBoxContainer.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/AddBoxContainer.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/AddBoxContainer.cs"
index 987b7ec..0de5794 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/AddBoxContainer.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/AddBoxContainer.cs"
@@ -5,6 +5,7 @@
using WIDESEA.Core.ManageUser;
using WIDESEA.Entity.DomainModels;
using WIDESEA.Services.Repositories;
+using static WIDESEA_Entity.CustomModels.RGVModel.RgvDeviceStatusModel;
namespace WIDESEA.Services.Services
{
@@ -42,7 +43,8 @@
if (standars.weighing_isCompute == 1)
{
//宸紓鍊�
- decimal differencWeiging = standars.weighing_standard_value.GetValueOrDefault() - currentWeighing;
+ // decimal differencWeiging = standars.weighing_standard_value.GetValueOrDefault() - currentWeighing;
+ decimal differencWeiging = int.Parse(goodsInfo.mesInfo_bak_3) - currentWeighing; // 鑲栦郊淇垚
if (differencWeiging < 0)
{
if (standars.weighing_positive_value >= -differencWeiging)
@@ -56,6 +58,10 @@
}
else
weighingResult = 1;
+ }
+ else // 鑲栦郊鍔犵殑鍚﹀垯鍒ゆ柇
+ {
+ weighingResult = 1;
}
Dt_container_head conHead = new Dt_container_head();
@@ -82,8 +88,19 @@
conDetail.containerdtl_madeUnit = goodsInfo.mesInfo_madeUnit;
conDetail.containerdtl_number = goodsInfo.mesInfo_number;
conDetail.containerdtl_goodsCode = goodsInfo.mesInfo_qrCode;
- conDetail.containerdtl_goodsWeight = ((decimal.Parse(taskInfo.task_weight) - decimal.Parse(dt_EmptyPallet.EmptyPallet_palletweight))
- + standars.weighing_addWeighing.GetValueOrDefault()).ToString();
+ conDetail.Standard_value = goodsInfo.mesInfo_bak_3; // 鑲栦郊鍔犱笂杩欎釜
+
+ conDetail.containerdtl_goodsWeight = "0"; // 鑲栦郊鍔犱笂浜嗚繖涓猧f 92 - 100琛�
+ if (standars != null)
+ {
+ if (standars.weighing_isCompute == 1)
+ {
+ conDetail.containerdtl_goodsWeight = ((decimal.Parse(taskInfo.task_weight) - decimal.Parse(dt_EmptyPallet.EmptyPallet_palletweight))
+ + standars.weighing_addWeighing.GetValueOrDefault()).ToString();
+ }
+ }
+
+
conDetail.containerdtl_creator = taskInfo.task_creator;
conDetail.containerdtl_createtime = DateTime.Now;
conDetail.containerdtl_text1 = "鏈祴閲�";
--
Gitblit v1.9.3