18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配套修改了条码不显示 名称

Browse Source
This commit is contained in:
18923810322
2026-03-12 15:48:31 +08:00
parent 69c381cf4e
commit 402da31758
12 changed files with 269 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

32
src/WMS.Web.Api/appsettings.json
View File

@@ -17,8 +17,8 @@
"AllowedHosts": "*", //允许所有主机
"AllowedCores": "localhost,http://localhost:8080,http://192.168.1.188:8080", //跨域
"AppOptions": {
"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址
// "DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址
//"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=test_wmsdb;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //测试数据库连接地址
"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;", //正式数据库连接地址
"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=3", //测试redis连接地址test_wmsdb
//"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=2", //正式redis连接地址
"RedisIpRateLimitingConnectionString": "47.110.156.96:16379,password=123456,DefaultDatabase=2", //redis连接地址
@@ -29,14 +29,24 @@
"RedisDirectory": "Test" //redis标记
},
"SoaOptions": {
"ModuleID": 25, //系统在单点系统的标记
"Url_V3": "https://dev.uc.v3.f2b211.com", //正式http://uc.v3.f2b211.com //单点系统的连接地址v3版
"ModuleID": 25, //系统在单点系统的标记（测试）
//"Url_V3": "https://dev.uc.v3.f2b211.com", //正式http://uc.v3.f2b211.com //单点系统的连接地址v3版
"Url_V3": "http://uc.v3.f2b211.com", //正式http://uc.v3.f2b211.com //单点系统的连接地址v3版
"Url": "http://dev.uc.f2b211.com", //单点系统的连接地址(老版 应该没用了)
"AppId": "100528847652388864", //系统Id
"AppSecret": "fa950a1fe690fe610338084b49db7db9", //系统授权
"PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4RaUAcPIEzHkMA0dvp51SbvC+ASiitHw9h6sCq8blqh8Cmx+ZfldxmX+sGqUDL40Eo07tQGWpY8WTlUROCOB9PIfZC6Wb+ntM6x8FzvcW5xfiKDfd6tbp5+ztFHVvutde0ceYk4VjOw5Q1wGJENZoQxQGd6/tt/cHbyNKF3HeAPCLJkMriKBXn3k4r4kix5oetVpaacFABBMRS019n/k0S8fg2H+72WaPVJElRk/iCkQwBA6JIKt/iSVXR8qMe+K6NTRnND4j5i7Ai0TgEV8MRlRMRVK7q4MyO0TPky//0HtVULdhb+G/XbF08ZgIgXlFBroQCEEj0RqdLio0Bg9wIDAQAB", //公钥
"PrivateKey": "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHhFpQBw8gTMeQwDR2+nnVJu8L4BKKK0fD2HqwKrxuWqHwKbH5l+V3GZf6wapQMvjQSjTu1AZaljxZOVRE4I4H08h9kLpZv6e0zrHwXO9xbnF+IoN93q1unn7O0UdW+6117Rx5iThWM7DlDXAYkQ1mhDFAZ3r+239wdvI0oXcd4A8IsmQyuIoFefeTiviSLHmh61WlppwUAEExFLTX2f+TRLx+DYf7vZZo9UkSVGT+IKRDAEDokgq3+JJVdHyox74ro1NGc0PiPmLsCLROARXwxGVExFUrurgzI7RM+TL//Qe1VQt2Fv4b9dsXTxmAiBeUUGuhAIQSPRGp0uKjQGD3AgMBAAECggEBAI/1MJDjtwdQPwJznKdobTXeJMdFwzrMpbhq34NzIojhfkziWNdFwTzhS6aTzEaXsK3hjTXx6C++jQa39dTIzdJZ/iSTo9IUFnbAWOWcuOv4i40+a/ALFsplNAwYNshNSkh3cH9FAlA4dd+fhY1ERA3/PeZBhB6V0+sa+AH/qwnzFY+lwOeuaUe4PNEjjnBVhzqV8XApca7HZNlrGmiTuO3J/e4k/FAP11iYYIf8e8JtgocinW1LIxJGBcp7Zyof37k4e+s25B0k5MkXiYlvveMsmlEcU+sYm+uLNtu8eG1R3b1qvi0H8ULdwoSParnKSyYMh0WlZTS8Ka3X33WeCOkCgYEA2Cc/nnJkwPaOXLiAbKg7/4hIne1X3rneVVbwCaebKXfSsCSGoVt5b8vBCgbVZNw79d8Z8ZLEf4e26ayLLXRz9QriMPiWyHUEr0XLZ4lq6E1EdZMBZWmjT9VY8NeAkB+eMPfCZLZe3OoVstuNQA0pGVFJgYXmXgcjJcidxzgIqU0CgYEA7EwAA6OP9DoQq4GcBCuIVGBjEWzbVekMt7f+WeLxGl3NYTWiXiaK6WjF/pvFv7AGQIqwOpnbKahWntpPj5DModhjQN8u/yonhzagubQbDTX0jR3w4gVsv/yyGgksPIwAQT/FW9cOqriqw8IGJG92VQw8dy6M1ZP9yK3yc41Q8VMCgYATH3XLaMdtIuL5ZQFHm6KjOsVh42uQstTuq+BUmlVp18X1+2VFxTf7IgWUA4LBh5JucCx1aMylk7Yk+jTd8p2HokzclEGSvneJoh0ardedcaiK1lSbSjs+htt1gztGhOWT43d5PYEq/jKpPi9C6WcnbD+ai+QTkYIUh6kdxOFPSQKBgQDltLfq0azWMUAVSYi+MQd1ZsHHpbfO2x+m1TFodgoFpJxL3JS7y+IMJvMaoJlqz5Y0Vd4dCYYZB/E0uWrQWGXlC3LpFE0edf85HWy/Ogt2GzZhnHKXdciTFfaZAsPDFCIHTBPyRKyYX655YHsSHly9Loj1HwZ/dT8nP5nKpNzDywKBgB3itp7eQ71y+6npr0MUcYF6cgjhPTLL03zVzJdR3ELzPFW+J69MFwqafoGu+xgGu43pDgIR6gVKqYhqfSk28oRl7YtO4fvk6KRcG5zrc1FyDw3S5XpVc5MhsxmBBXZj5ivBkoqxyDAOqu3MDCbHqg1J5inDu2gA8tbsgJ41pTER" //私钥
},
//"SoaOptions": {
// "ModuleID": 23,//正式配制
// "Url_V3": "http://uc.v3.f2b211.com",
// "Url": "http://dev.uc.f2b211.com",
// "AppId": "99731478887268357",
// "AppSecret": "b3081f88a5e13c747689c4133df283bb",
// "PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqDuFdS1zf8sNagPmVlLbwomEhu7EXQySV+OOWLL8vTsMKQa2RAsyVCZCviGINDsg7hlvOgGcoSvcEX7Ep9jeGasXoMbNcrBBN2zlKj91uv0MVWJuAHT24Smj3Kb9RQsUG0zyuAi8Qg9ZnWe26WiMbzUr+U5ECGuLFHu9cctVV4skbmSYUkWey9dd1h99qYzB/2oQN2X9kUGn+QhtmPBbnJF6eB9RuMG4Z1+vVQnEMnLmii8T3LCao7TLv2IpT38M4nlytSyU8i6eUj+bQ6RIw1UPbRrQcGCzTsk8gS3/E1NJkGtQRpTu2nD1KKVLSE0+68QiwpBEC7uQGqpKR2K/8QIDAQAB",
// "PrivateKey": "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCoO4V1LXN/yw1qA+ZWUtvCiYSG7sRdDJJX445Ysvy9OwwpBrZECzJUJkK+IYg0OyDuGW86AZyhK9wRfsSn2N4Zqxegxs1ysEE3bOUqP3W6/QxVYm4AdPbhKaPcpv1FCxQbTPK4CLxCD1mdZ7bpaIxvNSv5TkQIa4sUe71xy1VXiyRuZJhSRZ7L113WH32pjMH/ahA3Zf2RQaf5CG2Y8FuckXp4H1G4wbhnX69VCcQycuaKLxPcsJqjtMu/YilPfwzieXK1LJTyLp5SP5tDpEjDVQ9tGtBwYLNOyTyBLf8TU0mQa1BGlO7acPUopUtITT7rxCLCkEQLu5AaqkpHYr/xAgMBAAECggEAfB8WM0MqgTHuHrbr3eraSyitB+ToKgLZglDZOGYuhOso6KgUGBXutxlXivIwjODHRgSsBK8lweAbSSkvrOsbyvJpx2yGLkUOiPcmCUqy8Rg8Xk71/A5QDAZt6KGoIaWv2wil19RSGac7ph/cW0+QtYgUfqcZGOFHxwAY4Pl1aNWE8OCBfFNqantf7HDpjNbPANCvGu1+Uat6hYXgGbx+Iss4gqUv9GahXzbS/gCHOO9n+Jw2Ru8hn3SfTbj/jm3JkKNJk4linU5a4j1TnZitBmiAXcRtCWNFfUpCj4rfaj75j1lYDvFZG5sLUgC1ZEsydOiYvIl4Wko2jYbUkyescQKBgQDMIOW7X6z08TqC1lvIXOmzwMBAf3Uhvmdib2I4pNJustGuMiaSzOanWYWfZVAeq69GjZTqnyI4VHG2h9FqmB73OjPc1zbb8qju2jnJEJiQmi/0InTcdzZQckP5uEZ6QtDi8iQ4qTPbbwSGcSGqGQ7/C78OXTwaVjTCFuKbzeHULQKBgQDS+35aV06QgUKhqWc0XGV+RABxrRr4EYHxtiQpnXMjsq+CwYtkYk3fHOW+8u5K+qvLnMs221vcp50YHdadGZRMSFv6xh01HGyrG8A4wfClVVmycfnkNSONQCxLa8YMP/WtQnvkIA8EiY2c5PNW3fiWT5PrShaGsMj8TL11IDOhVQKBgAYSEGLzJHSgW+oaL96UjMqwt8bzQ2t+exqdT2F53Vw3ay7wBN+mwlFFw0iLPce7uVmyyjP0CZN9R2hzP5IY9grKK1Ks/8+otsdrq/5DxRW/0B9Fiw4naXEZBNZ/WXE3XXjyVItu1MD42zyYTrT9S8nf8o2dzjTGTYlcHt8dT1L9AoGAaQhOpMbmE8Zl13kwKb79v9g2qGDXFjwRBrX4VsdNdK4V9fBIZpcR0UrfjSn/O1CDif/qosqddsHy0Pi5yMfdLgSv1a4fCDu4VY6hKSBTnttYph9bmiJiKoWSB5IFrD+DHNgGOVFEaKvZ1gucoNgsUxgWuYHOqQsFY6UIhHCdg2kCgYEAu/7joy54lbxvRXPt+cjjCdBbp0yk81zvvGDc16NXxg7sR6oBivsIMIAxmkKucs68xnpBjfITJkrH6x6In8yChUamNzjYOCcaaj1dgN4CFon4NeLWRcMw/NA8aTe6TiAd/SEzftyLJMrN9sWKvIfpfO1IXplcEabpCC/I9MK8n+c="
//},
//"ErpOptions": {
// "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //金蝶连接地址
// "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd //金蝶账户名
@@ -49,12 +59,20 @@
// // "ZhangTaoId": "663a26829afbdd" //正式金蝶账套Id
//},
//"ErpOptions": {
// "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //金蝶连接地址
// "UserName": "orico", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd //金蝶账户名
// "Password": "A123321.", //测试金蝶密码
// "ErpId": "Orico", //金蝶Id
// "ZhangTaoId": "663a26829afbdd" //金蝶账套Id
//},
"ErpOptions": {
"EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //金蝶连接地址
"UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd //金蝶账户名
"Password": "A1B2C3Dh.", //金蝶密码
"Password": "A1B2C3Dh.", //测试金蝶密码
"ErpId": "ce20210909", //金蝶Id
"ZhangTaoId": "6723b1acf19987" //金蝶账套Id
"ZhangTaoId": "6784917b3d7e0e" //金蝶账套Id
},
"OpsOptions": {
@@ -71,7 +89,7 @@
"Url": "https://openapi.jushuitan.com", //聚水潭连接地址
"AppKey": "17231841286c45f99eb9acf445404349", //聚水潭Key
"AppSecret": "5ce9641ae6db4abb8b96eea7df6a81e9", //聚水潭授权
"AccessToken": "4605358c37374780a8a4395e6cdb1c3f" //一年后过期(2025/10/18)
"AccessToken": "4646187340384bcebbc31c6aac725840" //一年后过期(2025/10/18)
},
"Qiniu": {
"AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms", //七牛云key

30
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -5405,6 +5405,21 @@
数字序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.MaterialName">
<summary>
名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.Specifications">
<summary>
规格
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsSerialNumbersResponse.BarCode">
<summary>
条码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialNumber">
<summary>
物料编码
@@ -6590,6 +6605,21 @@
数字序列号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.MaterialName">
<summary>
名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.Specifications">
<summary>
规格
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SerialNumbers.SerialNumbersWmsResponse.BarCode">
<summary>
条码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.IdRequest">
<summary>
ID请求对象

15
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -2349,6 +2349,21 @@
创建时间(老ops过来)
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers.Specifications">
<summary>
规格型号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers.BarCode">
<summary>
条码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.SerialNumbers.CompleteCartonTime">
<summary>
完成装箱时间

18
src/WMS.Web.Core/Dto/OpsBoxResponse.cs
View File

@@ -95,9 +95,21 @@ namespace WMS.Web.Core.Dto
/// </summary>
[JsonProperty("NumberCode")]
public string NumberCode { get; set; }
/// <summary>
/// 名称
/// </summary>
[JsonProperty("MaterialName")]
public string MaterialName { get; set; }
/// <summary>
/// 规格
/// </summary>
[JsonProperty("Specifications")]
public string Specifications { get; set; }
/// <summary>
/// 条码
/// </summary>
[JsonProperty("BarCode")]
public string BarCode { get; set; }
}
public class OpsBoxDetailsResponse {

14
src/WMS.Web.Core/Dto/SerialNumbers/SerialNumbersWmsResponse.cs
View File

@@ -49,6 +49,20 @@ namespace WMS.Web.Core.Dto.SerialNumbers
/// 数字序列号
/// </summary>
public string NumberCode { get; set; }
/// <summary>
/// 名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 规格
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 条码
/// </summary>
public string BarCode { get; set; }
}
}

20
src/WMS.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -17,7 +17,7 @@ namespace WMS.Web.Domain.Entitys
public class SerialNumbers : EntityBase
{
public SerialNumbers() { }
public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount,string numberCode)
public SerialNumbers(string serialNumber, string materialNumber, int boxId, int opsBoxId, string creator, DateTime? createTime, DateTime? completeCartonTime,int isTwo,string twoSerialNumber,string isNotCount,string numberCode,string MaterialName,string Specifications,string BarCode)
{
this.SerialNumber = serialNumber;
this.MaterialNumber = materialNumber;
@@ -30,6 +30,9 @@ namespace WMS.Web.Domain.Entitys
this.TwoSerialNumber = twoSerialNumber;
this.IsNotCount = isNotCount;
this.NumberCode = numberCode;
this.MaterialName = MaterialName;
this.Specifications = Specifications;
this.BarCode = BarCode;
}
/// <summary>
/// 主键 订单编号
@@ -67,6 +70,21 @@ namespace WMS.Web.Domain.Entitys
[Column("CreateTime")]
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 物料名称
/// </summary>
[Column("MaterialName")]
public string? MaterialName { get; set; }=string.Empty;
/// <summary>
/// 规格型号
/// </summary>
[Column("Specifications")]
public string? Specifications { get; set; } = string.Empty;
/// <summary>
/// 条码
/// </summary>
[Column("BarCode")]
public string? BarCode { get; set; } = string.Empty;
/// <summary>
/// 完成装箱时间
/// </summary>
[Column("CompleteCartonTime")]

2
src/WMS.Web.Domain/Services/BoxService.cs
View File

@@ -111,7 +111,7 @@ namespace WMS.Web.Domain.Services
//SerialNumbers s = new SerialNumbers(serialList[i].SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime);
//sList.Add(s);
SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount,sn.NumberCode);
SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialNumber, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime, b.CompleteCartonTime,sn.IsTwo, sn.TwoSerialNumber, sn.IsNotCount,sn.NumberCode,sn.MaterialName,sn.Specifications,sn.BarCode);
sList.Add(s);
//序列号记录(序列号生成)
SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialNumber, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime);

17
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -837,6 +837,13 @@ namespace WMS.Web.Domain.Services
else if (entity.Type == InstockType.ProduceSotck)
ProduceSotck_sourceBillNos.Add(entity.SourceBillNo);
}
if (Instock_sourceBillNos.Count() > 0)
{
var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null);
if (!erp_result.IsSuccess)
return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
erp_list.AddRange(erp_result.Data);
}
if (Transferin_sourceBillNos.Count() > 0)
{
var erp_result = await _erpService.BillQueryForTransferin(Transferin_sourceBillNos, null);
@@ -847,19 +854,15 @@ namespace WMS.Web.Domain.Services
if (ProduceSotck_sourceBillNos.Count() > 0)//生产入库
{
// ProduceSotck_sourceBillNos.Clear();
//ProduceSotck_sourceBillNos.Add("HWQD-ITC-250808-00004-1");
var erp_result = await _erpService.BillQueryForProduceSotckin(ProduceSotck_sourceBillNos, null);
if (!erp_result.IsSuccess)
return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
erp_list.AddRange(erp_result.Data);
}
if (Instock_sourceBillNos.Count() > 0)
{
var erp_result = await _erpService.BillQueryForPurchaseInStock(Instock_sourceBillNos, null);
if (!erp_result.IsSuccess)
return Result<List<ErpInStockResultDto>>.ReFailure(erp_result.Message, erp_result.Status);
erp_list.AddRange(erp_result.Data);
}
if (Miscellaneous_sourceBillNos.Count() > 0)
{
var erp_result = await _erpService.BillQueryForMiscellaneous(Miscellaneous_sourceBillNos, null);

18
src/WMS.Web.Domain/Services/ProductInventoryService.cs
View File

@@ -142,12 +142,12 @@ namespace WMS.Web.Domain.Services
//获取原数据
var yList = await _repositories.GetEntityList(ProductInventoryType.JushuiTan);
//获取领星仓库
//获取聚水潭仓库
var resStock = await _juShuiTanService.GetStock();
if (!resStock.IsSuccess) return resStock;
var ids = resStock.Data.Where(w => listNames.Contains(w.Name)).Select(s => s.Id).ToList();
//获取领星库存
//获取聚水潭库存
var resInventory = await _juShuiTanService.GetInventory(ids);
_logger.LogInformation($"拉取聚水潭数据结果:{resInventory.IsSuccess} {resInventory.Message}");
if (!resInventory.IsSuccess) return resStock;
@@ -318,17 +318,21 @@ namespace WMS.Web.Domain.Services
try
{
var res = await this.Erp();
_logger.LogInformation($"同步成品仓库存(物料) {res.IsSuccess} {res.Message}");
var res = await this.LingXing();
_logger.LogInformation($"同步成品仓库存(领星) {res.IsSuccess} {res.Message}");
if (!res.IsSuccess) return res;
res = await this.JuShuiTan();
res = await this.JuShuiTan();
_logger.LogInformation($"同步成品仓库存(聚水潭) {res.IsSuccess} {res.Message}");
if (!res.IsSuccess) return res;
res = await this.LingXing();
_logger.LogInformation($"同步成品仓库存(领星) {res.IsSuccess} {res.Message}");
res = await this.Erp();
_logger.LogInformation($"同步成品仓库存(物料) {res.IsSuccess} {res.Message}");
if (!res.IsSuccess) return res;
}
catch (Exception ex)
{

8
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -539,7 +539,7 @@ namespace WMS.Web.Domain.Services
if (s_entity == null)
{
//序列号
SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0","");
SerialNumbers s_new = new SerialNumbers(s, takeStockDetail.MaterialNumber, takeStockDetail.Id, 0, "", DateTime.Now, DateTime.Now, 1, s, "0","","","","");
sList.Add(s_new);
}
else
@@ -670,7 +670,7 @@ namespace WMS.Web.Domain.Services
isNotCount = "0";
}
SerialNumbers entity = new SerialNumbers(NumberCode[j], res.Data.MaterialNumber
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount,res.Data.NumberCode);
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoNumberCode, isNotCount,res.Data.NumberCode, res.Data.MaterialName,res.Data.Specifications,res.Data.BarCode);
var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
}
@@ -690,7 +690,7 @@ namespace WMS.Web.Domain.Services
isNotCount = "0";
}
SerialNumbers entity = new SerialNumbers(serial[j], res.Data.MaterialNumber
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount,res.Data.NumberCode);
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, isNotCount,res.Data.NumberCode,res.Data.MaterialName,res.Data.Specifications,res.Data.BarCode);
var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
}
@@ -716,7 +716,7 @@ namespace WMS.Web.Domain.Services
SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount,res.Data.NumberCode);
, 0, 0, res.Data.Creator, res.Data.CreateTime, null, res.Data.IsTwo, res.Data.TwoSerialNumber, res.Data.IsNotCount,res.Data.NumberCode,res.Data.MaterialName,res.Data.Specifications,res.Data.BarCode);
var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);

125
老的配制.txt Normal file
View File

@@ -0,0 +1,125 @@
apiVersion: v1
data:
appsettings.json: |-
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information",
"Ops.Web.Repositories": "Information"
}
},
"AllowedHosts": "*",
"AllowedCores": "*,localhost,http://localhost:8080,http://wms.f2b211.com,https://wms.f2b211.com,https://wmspda.f2b211.com,http://wmspda.f2b211.com",
"AppOptions": {
"DBConnectionString": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;",
"RedisConnectionString": "47.106.232.90:6379,password=orico.2020,DefaultDatabase=2",
"RedisIpRateLimitingConnectionString": "192.168.2.105:16379,password=123456,DefaultDatabase=2",
"SingleBaseUrl": "http://192.168.12.111:443/api",
"DBType": "Mysql",
"CompanyId": 1,
"AllowCache": false,
"RedisDirectory": "wms"
},
"SoaOptions": {
"ModuleID": 23,
"Url_V3": "http://uc.v3.f2b211.com",
"Url": "http://dev.uc.f2b211.com",
"AppId": "99731478887268357",
"AppSecret": "b3081f88a5e13c747689c4133df283bb",
"PublicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqDuFdS1zf8sNagPmVlLbwomEhu7EXQySV+OOWLL8vTsMKQa2RAsyVCZCviGINDsg7hlvOgGcoSvcEX7Ep9jeGasXoMbNcrBBN2zlKj91uv0MVWJuAHT24Smj3Kb9RQsUG0zyuAi8Qg9ZnWe26WiMbzUr+U5ECGuLFHu9cctVV4skbmSYUkWey9dd1h99qYzB/2oQN2X9kUGn+QhtmPBbnJF6eB9RuMG4Z1+vVQnEMnLmii8T3LCao7TLv2IpT38M4nlytSyU8i6eUj+bQ6RIw1UPbRrQcGCzTsk8gS3/E1NJkGtQRpTu2nD1KKVLSE0+68QiwpBEC7uQGqpKR2K/8QIDAQAB",
"PrivateKey": "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCoO4V1LXN/yw1qA+ZWUtvCiYSG7sRdDJJX445Ysvy9OwwpBrZECzJUJkK+IYg0OyDuGW86AZyhK9wRfsSn2N4Zqxegxs1ysEE3bOUqP3W6/QxVYm4AdPbhKaPcpv1FCxQbTPK4CLxCD1mdZ7bpaIxvNSv5TkQIa4sUe71xy1VXiyRuZJhSRZ7L113WH32pjMH/ahA3Zf2RQaf5CG2Y8FuckXp4H1G4wbhnX69VCcQycuaKLxPcsJqjtMu/YilPfwzieXK1LJTyLp5SP5tDpEjDVQ9tGtBwYLNOyTyBLf8TU0mQa1BGlO7acPUopUtITT7rxCLCkEQLu5AaqkpHYr/xAgMBAAECggEAfB8WM0MqgTHuHrbr3eraSyitB+ToKgLZglDZOGYuhOso6KgUGBXutxlXivIwjODHRgSsBK8lweAbSSkvrOsbyvJpx2yGLkUOiPcmCUqy8Rg8Xk71/A5QDAZt6KGoIaWv2wil19RSGac7ph/cW0+QtYgUfqcZGOFHxwAY4Pl1aNWE8OCBfFNqantf7HDpjNbPANCvGu1+Uat6hYXgGbx+Iss4gqUv9GahXzbS/gCHOO9n+Jw2Ru8hn3SfTbj/jm3JkKNJk4linU5a4j1TnZitBmiAXcRtCWNFfUpCj4rfaj75j1lYDvFZG5sLUgC1ZEsydOiYvIl4Wko2jYbUkyescQKBgQDMIOW7X6z08TqC1lvIXOmzwMBAf3Uhvmdib2I4pNJustGuMiaSzOanWYWfZVAeq69GjZTqnyI4VHG2h9FqmB73OjPc1zbb8qju2jnJEJiQmi/0InTcdzZQckP5uEZ6QtDi8iQ4qTPbbwSGcSGqGQ7/C78OXTwaVjTCFuKbzeHULQKBgQDS+35aV06QgUKhqWc0XGV+RABxrRr4EYHxtiQpnXMjsq+CwYtkYk3fHOW+8u5K+qvLnMs221vcp50YHdadGZRMSFv6xh01HGyrG8A4wfClVVmycfnkNSONQCxLa8YMP/WtQnvkIA8EiY2c5PNW3fiWT5PrShaGsMj8TL11IDOhVQKBgAYSEGLzJHSgW+oaL96UjMqwt8bzQ2t+exqdT2F53Vw3ay7wBN+mwlFFw0iLPce7uVmyyjP0CZN9R2hzP5IY9grKK1Ks/8+otsdrq/5DxRW/0B9Fiw4naXEZBNZ/WXE3XXjyVItu1MD42zyYTrT9S8nf8o2dzjTGTYlcHt8dT1L9AoGAaQhOpMbmE8Zl13kwKb79v9g2qGDXFjwRBrX4VsdNdK4V9fBIZpcR0UrfjSn/O1CDif/qosqddsHy0Pi5yMfdLgSv1a4fCDu4VY6hKSBTnttYph9bmiJiKoWSB5IFrD+DHNgGOVFEaKvZ1gucoNgsUxgWuYHOqQsFY6UIhHCdg2kCgYEAu/7joy54lbxvRXPt+cjjCdBbp0yk81zvvGDc16NXxg7sR6oBivsIMIAxmkKucs68xnpBjfITJkrH6x6In8yChUamNzjYOCcaaj1dgN4CFon4NeLWRcMw/NA8aTe6TiAd/SEzftyLJMrN9sWKvIfpfO1IXplcEabpCC/I9MK8n+c="
},
"ErpOptions": {
"EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx",
"UserName": "orico",
"Password": "A123321.",
"ErpId": "Orico",
"ZhangTaoId": "663a26829afbdd"
},
"OpsOptions": {
"Url": "https://opsscmapi.f2b211.com/",
"UserName": "admin",
"PassWord": "888888"
},
"LingXingOptions": {
"Url": "https://openapi.lingxing.com",
"AppId": "ak_QGK2J8TssERmu",
"AppSecret": "n/HUKD2wVdTbvhnFZbVBPw=="
},
"JuShuiTanOptions": {
"Url": "https://openapi.jushuitan.com",
"AppKey": "17231841286c45f99eb9acf445404349",
"AppSecret": "5ce9641ae6db4abb8b96eea7df6a81e9",
"AccessToken": "4605358c37374780a8a4395e6cdb1c3f" //一年后过期(2025/10/18)
},
"Qiniu": {
"AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms",
"SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q",
"Bucket": "orico-wms",
"Url": "https://wmsfile.f2b211.com/"
},
"QuartzJobOptions": {
"JobStoreTypeKey": "quartz.jobStore.type",
"JobStoreTypeValue": "Quartz.Impl.AdoJobStore.JobStoreTX, Quartz",
"JobStoreDriverDelegateTypeKey": "quartz.jobStore.driverDelegateType",
"JobStoreDriverDelegateTypeValue": "Quartz.Impl.AdoJobStore.MySQLDelegate, Quartz",
"JobStoreTablePrefixKey": "quartz.jobStore.tablePrefix",
"JobStoreTablePrefixValue": "QRTZ_",
"JobStoreDataSourceKey": "quartz.jobStore.dataSource",
"JobStoreDataSourceValue": "myDS",
"JobStoreConnectionStringKey": "quartz.dataSource.myDS.connectionString",
"JobStoreConnectionStringValue": "Server=rm-wz9215skklas0287pwo.mysql.rds.aliyuncs.com; Database=wms_db;User Id=orico_erp;password=Orico2023;port=3306;CharSet=gb2312;Connect Timeout=150;",
"JobStoreProviderKey": "quartz.dataSource.myDS.provider",
"JobStoreProviderValue": "MySql",
"JobStartHour": [ 15, 11, 1, 0, 0, 10 ],
"JobStartMinute": [ 30, 39, 30, 20, 5, 5 ],
"JobStartExpre": "0 0/10 * * * ?",
"JobStartExpreAmount": "0 50 23 * * ?",
"JobStartExpreSend": "0 0 12,16,20 * * ?",
"JobStartExpreMaterial": "0 30 23 * * ?",
"JobStartErpDelete": "0 5 * * * ?",
"JobStartProductInventory": "0 0/30 * * * ?",
"JobStoreClusteredKey": "quartz.jobStore.clustered",
"JobStoreClusteredValue": true,
"JobStoreInstanceIdKey": "quartz.scheduler.instanceId",
"JobStoreInstanceIdValue": "AUTO",
"QuartzJobKey": "OpsJob",
"QuartzJobValue": "OpsJobGroup",
"QuartzJobDescription": "OpsJob",
"QuartzTriggerIdentity": "OpsTrigger",
"QuartzTriggerDescription": "OpsJobTrigger"
},
"EmailOptions": {
"SmtpServer": "smtp.qiye.aliyun.com",
"SmtpPort": 587,
"SenderName": "深圳市元创时代",
"SendTitle": "【深圳市元创时代】-产品入库通知",
"SenderEmail": "info@f2b211.com",
"SenderEmailPwd": "K4h6GgxZYGMYV1Bb"
},
"SmsOptions": {
"AccessKeyId": "LTAI5tBJg6KeDV2V1NiS7Ngi",
"AccessKeySecret": "MAC8bMovSFyCgRQGkfhVcL1jvLJ8cP",
"SignName": "深圳市元创时代",
"TemplateCode": "SMS_465408787"
}
}
kind: ConfigMap
metadata:
creationTimestamp: "2024-01-08T07:53:40Z"
managedFields:
- apiVersion: v1
fieldsType: FieldsV1
fieldsV1:
f:data:
.: {}
f:appsettings.json: {}
manager: tke-platform-api
operation: Update
time: "2024-01-08T07:53:40Z"
name: wms-setting
namespace: default
resourceVersion: "56223518312"
uid: 0a1d246a-2863-4f22-a79e-76aaa86c0e5e