Merge branch 'main' of http://8.130.121.29:3000/TianHua/Piolot_Order_TH

# Conflicts: # GZ_LTHPilot_ORDER.csproj # SAL_DELIVERYNOTICE/PushCeLue.cs # SAL_ORDER/SaveWL.cs # SQL/SqlManage.cs # bin/Debug/GZ_LTHPilot_ORDER.dll # bin/Debug/GZ_LTHPilot_ORDER.pdb
2025-07-04 18:01:07 +08:00
parent 95a74dc4f5 569ca39775
commit 38fe912549
5 changed files with 24 additions and 0 deletions
--- a/SAL_ORDER/SaveWL.cs
+++ b/SAL_ORDER/SaveWL.cs
@@ -30,7 +30,11 @@ namespace GZ_LTHPilot_ORDER.SAL_ORDER
                        {
                            e.Cancel = true;
                            throw new Exception(
+<<<<<<< HEAD
                                string.Format(@"物料编码J.06.00开头,且订单日期大于2025/05/10，则明细物联网卡使用年份字段必填")
+=======
+                                string.Format(@"物料编码J开头，则明细物联网卡使用年份字段必填")
+>>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2
                            );
                        }
                    }