From 5ab19c977cfb0551a88b3885b0648183fbfff672 Mon Sep 17 00:00:00 2001
From: libo <Administrator@DESKTOP-1A6QMNS>
Date: 星期一, 31 三月 2025 10:10:12 +0800
Subject: [PATCH] 调整wms出入库、返库逻辑，调整与比亚迪接口对接的类型和方法，调整配置参数，写入服务器上数据库密码
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 78 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
index 3e0ef2d..e354f2c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
@@ -11,6 +11,8 @@
using System.IO;
using WIDESEA_Model.Models;
using System;
+using Newtonsoft.Json;
+using WIDESEA_Core.LogHelper;
namespace WIDESEA_WMSServer.Controllers
{
@@ -51,7 +53,7 @@
[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
public async Task<WebResponseContent> UploadApk(IEnumerable<IFormFile> fileInput)
- {
+ {
// 妫�鏌ユ槸鍚︽湁鏂囦欢涓婁紶
if (fileInput == null || !fileInput.Any())
{
@@ -60,7 +62,7 @@
var formFile = fileInput.First();
var uploadFolder = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "Upload");
- Directory.CreateDirectory(uploadFolder);
+ Directory.CreateDirectory(uploadFolder);
var fileName = $"WMS-PDA.apk";
var filePath = Path.Combine(uploadFolder, fileName);
@@ -101,7 +103,7 @@
}
memory.Position = 0;
var ext = Path.GetExtension(filePath).ToLowerInvariant();
- return File(memory, new Dictionary<string, string>{{ ".apk", "application/vnd.android.package-archive" }}[ext], Path.GetFileName(filePath));
+ return File(memory, new Dictionary<string, string> { { ".apk", "application/vnd.android.package-archive" } }[ext], Path.GetFileName(filePath));
}
/// <summary>
@@ -112,7 +114,7 @@
[HttpPost, Route("EmptyInBound"), AllowAnonymous]
public WebResponseContent EmptyInBound(string PalletCode)
{
- return _taskService.PalletInboundRequest("R01-001-023-001",PalletCode);
+ return _taskService.PalletInboundRequest("R01-001-023-001", PalletCode);
}
@@ -120,11 +122,12 @@
/// 绌烘墭鍑哄簱
/// </summary>
/// <param name="PalletCode">鎵樼洏鍙�</param>
+ /// <param name="trayType">鎵樼洏绫诲瀷锛�1锛屽皬鎵樼洏 2锛屽ぇ鎵樼洏</param>
/// <returns></returns>
- [HttpPost, Route("EmptyOutBound"), AllowAnonymous]
- public WebResponseContent EmptyOutBound()
+ [HttpGet, Route("EmptyOutBound"), AllowAnonymous]
+ public WebResponseContent EmptyOutBound(string trayType)
{
- return _taskService.PalletOutboundTask("R01", "R01-001-023-001");
+ return _taskService.PalletOutboundTask("R01", "R01-001-023-001", trayType);
}
@@ -134,8 +137,57 @@
/// <param name="materielGroupDTO"></param>
/// <returns></returns>
[HttpPost, Route("MaterielGroup"), AllowAnonymous]
- public WebResponseContent MaterielGroup([FromBody] MaterielGroupDTO materielGroupDTO)
+ public WebResponseContent MaterielGroup([FromBody] SaveModel saveModel)
{
+ string PalletCode = saveModel.MainData["PalletCode"].ToString();
+ var ReceviveSN = saveModel.MainData["SerialNumbers"];
+
+ string str = "1.0 ReceviveSN=" + ReceviveSN;
+ //Logger.Write_Log("System/test", "", str);
+
+ List<string> OldSerialNumbers = JsonConvert.DeserializeObject<List<string>>(ReceviveSN.ToString());
+ List<string> SerialNumbers = new List<string>();
+ string code = "";
+ foreach (var number in OldSerialNumbers)
+ {
+
+ //Logger.Write_Log("System/test", "", "1.0.1 ");
+ if (number.Contains("S:"))
+ {
+
+ //Logger.Write_Log("System/test", "", "1.0.1.1 ");
+ List<string> nums = number.Split(';').ToList();
+ foreach (var item in nums)
+ {
+ if (item.Contains("S:"))
+ {
+ //Logger.Write_Log("System/test", "", "1.0.1.2 ");
+ string SerialNumber = item.Replace("S:", "");
+ if (!string.IsNullOrEmpty(SerialNumber))
+ {
+ SerialNumbers.Add(SerialNumber);
+ code += SerialNumber;
+ }
+
+ }
+ }
+
+ }
+ else
+ {
+
+ //Logger.Write_Log("System/test", "", "1.0.2 ");
+ SerialNumbers.Add(number);
+ code += number;
+ }
+ }
+
+ //Logger.Write_Log("System/test", "", "1.1 " + code);
+
+ MaterielGroupDTO materielGroupDTO = new MaterielGroupDTO();
+ materielGroupDTO.SerialNumbers = SerialNumbers;
+ materielGroupDTO.OrderNo = "";
+ materielGroupDTO.PalletCode = PalletCode;
return _inboundService.InbounOrderService.MaterielGroup(materielGroupDTO);
}
@@ -144,7 +196,7 @@
/// </summary>
/// <param name="PalletCode">鎵樼洏鍙�</param>
/// <returns></returns>
- [HttpPost, Route("MaterielInBoundConfirm"), AllowAnonymous]
+ [HttpGet, Route("MaterielInBoundConfirm"), AllowAnonymous]
public WebResponseContent MaterielInBoundConfirm(string palletCode)
{
return _taskService.InboundRequest("R01-001-023-001", palletCode);
@@ -155,7 +207,7 @@
/// </summary>
/// <param name="PalletCode">鎵樼洏鍙�</param>
/// <returns></returns>
- [HttpPost, Route("MaterielGroupRevoke"), AllowAnonymous]
+ [HttpGet, Route("MaterielGroupRevoke"), AllowAnonymous]
public WebResponseContent MaterielGroupRevoke(string PalletCode)
{
return _inboundService.InbounOrderService.MaterielGroupRevoke(PalletCode);
@@ -166,10 +218,10 @@
/// </summary>
/// <param name="PalletCode">鎵樼洏鍙�</param>
/// <returns></returns>
- [HttpPost, Route("MaterielInBoundReturnConfirm"), AllowAnonymous]
- public WebResponseContent MaterielInBoundReturnConfirm([FromBody] string PalletCode)
+ [HttpGet, Route("MaterielInBoundReturnConfirm"), AllowAnonymous]
+ public WebResponseContent MaterielInBoundReturnConfirm(string PalletCode)
{
- return null;
+ return _taskService.ReturnInboundRequest("R01-001-023-001", PalletCode);
}
--
Gitblit v1.9.3