Merge branch 'master' of http://119.3.29.177:3000/Jjie/DeYiShiBase

# Conflicts:
#	ICSSoft.FromERP/ICSSoft.Test/Program.cs

ICSSoft.FromERP/ICSSoft.FromERP/ICSPO.cs

@@ -68,11 +68,12 @@ namespace ICSSoft.FromERP
                     s.field = "modifyTime";
                     s.op = "gt";
                     s.value1 = "2025-03-21";
-
-                    s.field = "bustype_name";
-                    s.op = "eq";
-                    s.value1 = "普通采购（有到货）";
                     ls.Add(s);
+                    DYSs ss = new DYSs();
+                    ss.field = "bustype_name";
+                    ss.op = "eq";
+                    ss.value1 = "普通采购（有到货）";
+                    ls.Add(ss);
                     #endregion
 
                     #region 添加排序

ICSSoft.FromERP/ICSSoft.Test/Program.cs

@@ -11,8 +11,10 @@ namespace ICSSoft.Test
         static void Main(string[] args)
         {
 
+          //  ICSPO a = new ICSPO();
+
             ICSDeliveryNotice a = new ICSDeliveryNotice();
-            //ICSInventory a = new ICSInventory();
+
             a.Execute();