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/BearingOutboundAction.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/BearingOutboundAction.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/BearingOutboundAction.cs"
index 5f0801a..6da05b1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/BearingOutboundAction.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Services/Common/BearingOutboundAction.cs"
@@ -59,6 +59,8 @@
//杞鍙�
string ldCode = saveModel.MainData["ldCode"].ToString();
+ //杞存壙浜у湴(鍥戒骇/杩涘彛)
+ string Placeoforigin = saveModel.MainData["Placeoforigin"].ToString();
//宸﹀嚭搴撹酱鎵�
VV_ContainerInfo leftContainer = null;
@@ -86,9 +88,10 @@
// && r.containerdtl_takeGoogsCheck == true);
List<VV_ContainerInfo> listContainer = VV_ContainerInfoRepository.Instance.Find(r => !r.location_islocked
- && r.location_state == LocationState.LocationState_Stored.ToString() && r.containerdtl_madeUnit == Manufacturer
- && r.containerdtl_standard.Contains(zcState) && r.materiel_id == materiel && r.containerdtl_standardResult == 1
- && (string.IsNullOrEmpty(r.csize_out_result) || r.csize_out_result == "鍚堟牸"));
+ && r.location_state == LocationState.LocationState_Stored.ToString() && r.containerdtl_madeUnit == Manufacturer
+ && r.containerdtl_standard.Contains(zcState) && r.materiel_id == materiel && r.containerdtl_standardResult == 1
+ && (string.IsNullOrEmpty(r.csize_out_result) || r.csize_out_result == "鍚堟牸") && r.containerdtl_qualityCheck == true
+ && r.containerdtl_takeGoogsCheck == true && r.Placeoforigin == Placeoforigin);
//listContainer = listContainer.OrderBy(x => DateTime.ParseExact(x.containerdtl_ProductDate,"yyyy-MM-dd",CultureInfo.InvariantCulture)).ToList();
@@ -238,6 +241,9 @@
// 杞存壙缂栫爜
string Bearing_code = saveModel.MainData["Bearing_code"].ToString();
+ //杞存壙浜у湴(鍥戒骇/杩涘彛)
+ string Placeoforigin = saveModel.MainData["Placeoforigin"].ToString();
+
// 鑾峰彇杞存壙璇︽儏鏁版嵁鍜屾祴閲忕殑鏁版嵁
Dt_container_size_info_hty size_info_hty = Dt_container_size_info_htyRepository.Instance.Find(x => x.csize_barcode == Bearing_code).ToList().LastOrDefault();
Dt_container_detail_hty detail_hty = Dt_container_detail_htyRepository.Instance.Find(x => x.containerdtl_goodsCode == Bearing_code).ToList().LastOrDefault();
@@ -285,6 +291,11 @@
return content.Error("杞存壙鏂版棫鐘舵�佷笉涓�鑷� 涓嶈兘杩涜鎵嬪姩閫夐厤");
}
+ if (!(detail_hty.Placeoforigin == Placeoforigin))
+ {
+ return content.Error("浜у湴涓嶄竴鑷� 涓嶈兘杩涜鎵嬪姩閫夐厤");
+ }
+
if ("left".Equals(ZCdirection))
{
string left_result = GetContainer2(listStandard, size_info_hty, zzjAVG, zfcbAVG, zydAVG, "left");
--
Gitblit v1.9.3