From 8a0e28f065e7414bef9386ed35b381a10bbabdc5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 04 三月 2026 16:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/物流管理/出运单/WLYayBillController.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs" "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
index 8b7b4e2..dba79a1 100644
--- "a/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
+++ "b/WebAPI/Controllers/\347\211\251\346\265\201\347\256\241\347\220\206/\345\207\272\350\277\220\345\215\225/WLYayBillController.cs"
@@ -446,7 +446,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDate_AllocationDriver"].ToString() == ""|| ds.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "")
+ if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDate_AllocationDriver"].ToString() == ""|| ds.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || ds.Tables[0].Rows[0]["HDriverID"].ToString() == "0")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -495,7 +495,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (ds.Tables[0].Rows[0]["HSurer_Pick"] == null || ds.Tables[0].Rows[0]["HSurer_Pick"].ToString() == "")
+ if (ds.Tables[0].Rows[0]["HSurer_Pick"] == null || ds.Tables[0].Rows[0]["HSurer_Pick"].ToString() == "" )
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -577,7 +577,7 @@
}
DataSet ds;
var dss = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
- if (dss.Tables[0].Rows[0]["HDate_CarrierSure"] == null || dss.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || dss.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ if (dss.Tables[0].Rows[0]["HDate_CarrierSure"] == null || dss.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || dss.Tables[0].Rows[0]["HChecker"].ToString() == "" || dss.Tables[0].Rows[0]["HDate_CarrierSure"] == "2000-01-01 00:00:00.000")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1