From fac0a766d0ffc555c75ad844d33c01cc080408f7 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 05 十二月 2025 10:43:37 +0800
Subject: [PATCH] 提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 45 +++++++++++++++++++++++----------------------
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs | 4 ++--
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs"
index b1304d5..b1efea1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs"
@@ -42,9 +42,9 @@
try
{
//erp 娴嬭瘯鐜
- var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "7e9239c1e132462a9cf03bfa342a044aMTcxODE5MzgxODI4Mw" };
+ //var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "7e9239c1e132462a9cf03bfa342a044aMTcxODE5MzgxODI4Mw" };
////erp 姝ｅ紡鐜
- //var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "9a3d0b5a37Bfc6dAM4b34ODb8ebDOSb937106d1b19DS29098" };
+ var request = new TokenRequest { appId = "BG_SYSTEM", secretKey = "9a3d0b5a37Bfc6dAM4b34ODb8ebDOSb937106d1b19DS29098" };
var response = await PostAsync<TokenRequest, TokenResponse>("auth/getAccessToken", request, includeToken: false);
var _token = response?.data?.access_token;
return _token ?? "";
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index 201f0f2..8bf4d4f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -68,13 +68,13 @@
public async Task<WebResponseContent> Test()
{
- var originalTask = _taskRepository.Db.Queryable<Dt_Task>().First();
+ //var originalTask = _taskRepository.Db.Queryable<Dt_Task>().First();
- var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.浜哄伐鍒犻櫎);
- if (result)
- {
- var sddd = "trueee";
- }
+ //var result = _task_HtyService.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.浜哄伐鍒犻櫎);
+ //if (result)
+ //{
+ // var sddd = "trueee";
+ //}
//var originalTask = _taskRepository.Db.Queryable<Dt_Task>().First();
//_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.鑷姩瀹屾垚);
// Service.Db.Deleteable<Dt_InboundOrder>().Where(x=>x.UpperOrderNo== "12020251100040").ExecuteCommand();
@@ -91,22 +91,23 @@
//var ddddssss = "WSLOT" + DateTime.Now.ToString("yyyyMMddHHmmss") + ssss.ToString().PadLeft(5, '0');
//erpApiService.GetSuppliersAsync();
- //erpApiService.GetMaterialUnitAsync();
- //var sss=await _invokeMESService.NewMaterielToMes(new WIDESEA_DTO.Basic.MaterielToMesDTO
- // {
- // reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- // reqCode = Guid.NewGuid().ToString(),
- // oldmaterialCode = "b001",
- // newmaterialCode = "Bar01",
- // unit = "A01",
- // operationType = 1,
- // supplyCode = "A0001",
- // batchNo = "A0002",
- // materialCode = "FC00001",
- // warehouseCode = "",
- // factoryArea = "A01",
- // qty = "20.0",
- // });
+ erpApiService.GetMaterialUnitAsync();
+
+ var sss = await _invokeMESService.NewMaterielToMes(new WIDESEA_DTO.Basic.MaterielToMesDTO
+ {
+ reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ reqCode = Guid.NewGuid().ToString(),
+ oldmaterialCode = "b001",
+ newmaterialCode = "Bar01",
+ unit = "A01",
+ operationType = 1,
+ supplyCode = "A0001",
+ batchNo = "A0002",
+ materialCode = "FC00001",
+ warehouseCode = "",
+ factoryArea = "A01",
+ qty =20,
+ });
//await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest
//{
--
Gitblit v1.9.3