From 557f02072fa311eefe3123aa44afebac22adc465 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期五, 24 四月 2026 17:24:43 +0800
Subject: [PATCH] 4-24
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/AddBoxContainer.cs | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 fb9ed6f..66317a7 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
{
@@ -31,6 +32,7 @@
throw new Exception($"娌℃湁鎵惧埌瀵逛换鍔℃墭鐩樺彿锛氥�恵taskInfo.task_barcode}銆戝搴旂殑绌烘墭鐩樺嚭搴撹褰�");
//0涓嶅悎鏍�,1鍚堟牸
int weighingResult = 0;
+ decimal Standard_value_NumResult = 0; //鏍囧噯鍊艰绠楃粨鏋�
Dt_weighing_standards standars = Dt_weighing_standardsRepository.Instance.FindFirst(r => r.weighing_materiel_id == boxDetail.boxdtl_materielid &&
r.weighing_bearing_id == boxDetail.boxdtl_type && r.weighing_manufacturer == goodsInfo.mesInfo_madeUnit && r.weighing_type == goodsInfo.mesInfo_standard);
if (null != standars)
@@ -42,7 +44,9 @@
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; // 鑲栦郊淇垚
+ Standard_value_NumResult = differencWeiging; // 鏍囧噯鍊艰绠楃粨鏋滆祴鍊�
if (differencWeiging < 0)
{
if (standars.weighing_positive_value >= -differencWeiging)
@@ -56,6 +60,10 @@
}
else
weighingResult = 1;
+ }
+ else // 鑲栦郊鍔犵殑鍚﹀垯鍒ゆ柇
+ {
+ weighingResult = 1;
}
Dt_container_head conHead = new Dt_container_head();
@@ -82,11 +90,25 @@
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.Placeoforigin = goodsInfo.mesInfo_bak_4; // 鑲栦郊鍔犱笂杩欎釜
+ conDetail.Standard_value_NumResult = Standard_value_NumResult.ToString();
+
+ 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 = "鏈祴閲�";
+ conDetail.containerdtl_text3 = "鏈妫�";
//绉伴噸缁撴灉
conDetail.containerdtl_standardResult = weighingResult;
--
Gitblit v1.9.3