From 65dac074f71375381eba0a5ff8dc108cacafc3f9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 25 六月 2024 10:18:16 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/UpApiController.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index c1093d8..e67646d 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -421,9 +421,12 @@
result.Message = "鍙枡浣嶇疆涓虹┖锛�";
return Ok(result);
}
+ if (string.IsNullOrWhiteSpace(pallmsg.Type))
+ {
+ result.Message = "浠诲姟绫诲瀷涓虹┖锛�";
+ return Ok(result);
+ }
_rcsserver.GetPalletNo(pallmsg);
-
-
result.Success = 0;
result.Message = "鍙《鎴愬姛锛�";
return Ok(result);
@@ -446,6 +449,21 @@
var result = new ErpModel { Success = -1, Message = "" };
try
{
+ if (string.IsNullOrWhiteSpace(pallmsg.Location))
+ {
+ result.Message = "鐢宠浣嶇疆涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.Type))
+ {
+ result.Message = "浠诲姟绫诲瀷涓虹┖锛�";
+ return Ok(result);
+ }
+ if (string.IsNullOrWhiteSpace(pallmsg.Palletno))
+ {
+ result.Message = "鐢宠鎵樼洏鍙蜂负绌猴紒";
+ return Ok(result);
+ }
_rcsserver.ApplyLocatNo(pallmsg);
result.Success = 0;
result.Message = "鐢宠鍌ㄤ綅鎴愬姛锛�";
--
Gitblit v1.8.0