调整wms出入库、返库逻辑，调整与比亚迪接口对接的类型和方法，调整配置参数，写入服务器上数据库密码

libo

2025-03-31 5ab19c977cfb0551a88b3885b0648183fbfff672

 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs

@@ -12,6 +12,7 @@
using WIDESEA_Model.Models;
using System;
using Newtonsoft.Json;
using WIDESEA_Core.LogHelper;

namespace WIDESEA_WMSServer.Controllers
{
@@ -139,22 +140,33 @@
        public WebResponseContent MaterielGroup([FromBody] SaveModel saveModel)
        {
            string PalletCode = saveModel.MainData["PalletCode"].ToString();  
            string ReceviveSN = saveModel.MainData["SerialNumbers"].ToString();
            List<string> OldSerialNumbers = JsonConvert.DeserializeObject<List<string>>(ReceviveSN);
            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;
                            }

                        }
@@ -163,10 +175,15 @@
                }
                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 = "";