yuyubo/MeiSaiSiXieTongApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

22

Browse Source
This commit is contained in:
余宇波 2025-05-22 22:55:14 +08:00
parent 58f7dfa648
commit 5699e86943
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs
View File

@ -56,6 +56,8 @@ namespace MyCode.Project.Domain.Message.Request.PurchaseOrder
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public string MaterialCode { get; set; } public string MaterialCode { get; set; }
} }
public class PurchaseOrderItemSearch public class PurchaseOrderItemSearch

7
MyCode.Project.Domain/Model/InvoiceOrderItem.cs
View File

@ -198,5 +198,12 @@ namespace MyCode.Project.Domain.Model
/// </summary> /// </summary>
public decimal? CuseQty {get;set;} public decimal? CuseQty {get;set;}
/// <summary>
/// Desc:金蝶的收料通知单号
/// Default:
/// Nullable:True
/// </summary>
public string ShouLiaoFBillNo {get;set;}
} }
} }

11
MyCode.Project.ScheduleTask/App.config
View File

@ -191,13 +191,20 @@
<!--是否是向文件中追加日志--> <!--是否是向文件中追加日志-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true" />
<!--log保留天数--> <!--log保留天数-->
<param name="MaxSizeRollBackups" value="30" /> <param name="MaxSizeRollBackups" value="300" />
<!--日志文件名是否是固定不变的--> <!--日志文件名是否是固定不变的-->
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false" />
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" />
<!--日志根据日期滚动--> <!--日志根据日期滚动-->
<param name="RollingStyle" value="Date" />
<!-- 启用复合模式 日期+文件大小分割-->
<rollingStyle value="Composite" />
<maximumFileSize value="50MB"/>
<!--日志根据日期滚动-->
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" />
</layout> </layout>

2
MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
View File

@ -200,7 +200,7 @@ namespace MyCode.Project.Services.Implementation
var oldItem = oldItems.FirstOrDefault(); var oldItem = oldItems.FirstOrDefault();
if (oldItems.Count > 1) if (oldItems.Count > 1)
{ {
oldItem= oldItems.FirstOrDefault(h=>h.FSupplierLot== FSupplierLot); oldItem= oldItems.Where(t=>t.MSSSupplierLot=="0" || t.MSSSupplierLot == null).FirstOrDefault(h=>h.FSupplierLot== FSupplierLot);
} }
if (oldItem == null) if (oldItem == null)
{ {

10
MyCode.Project.WebApi/Web.config
View File

@ -182,11 +182,17 @@
<param name="StaticLogFileName" value="false" /> <param name="StaticLogFileName" value="false" />
<!--日志文件名格式为:2008-08-31.log--> <!--日志文件名格式为:2008-08-31.log-->
<param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" /> <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" />
<!--日志根据日期滚动--> <!-- 按大小分割 -->
<param name="RollingStyle" value="Date" /> <maximumFileSize value="50MB"/>
<!-- 启用复合模式 日期+文件大小分割-->
<rollingStyle value="Composite" />
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" />
</layout> </layout>
</appender> </appender>
<logger name="MyCode.Project.Logger"> <logger name="MyCode.Project.Logger">
<level value="ERROR" /> <level value="ERROR" />