bklLiudl
2024-08-15 764fb76eb4a710e217a947abb443801a0a5016a0
业务流程测试
6个文件已修改
52 ■■■■■ 已修改文件
Pda/View/SoSetting/pinTuoOut.html 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Model/ModelVm/BllTaskVm/TaskSyncInfoVm.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/PdaSoController.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/appsettings.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/SoSetting/pinTuoOut.html
@@ -808,7 +808,9 @@
                    SoNo: $("#bar").val(),
                };
                synData(IP + "/PdaSo/GetSoSkuLotNoListByPallet", param, 'post', function (res) {
                    console.log(res);
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
                                $("#skuLotNo").append('<option value =' + res.data[i].SoDetailId + ' selected>' + res.data[i].SkuName + " - " + res.data[i].LotNo + '</option>');
@@ -835,6 +837,7 @@
                    SoDetailId: $("#skuLotNo").val(),
                };
                synData(IP + "/PdaSo/GetPlanAndFinishQty", param, 'post', function (res) {
                    console.log("A00");
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        $("#planQty").val(res.data.PlanQty)
@@ -1256,8 +1259,8 @@
                            console.log(2)
                            updateSkuLotNoList2();
                            updateQtyList2();
                            getBar2();
                            GetDataInfo();
                            // getBar2();
                            // GetDataInfo();
                        }
                    } else { //不成功
@@ -1306,6 +1309,8 @@
                    SoNo: $("#bar2").val(),
                };
                synData(IP + "/PdaSo/GetSoSkuLotNoListByPallet", param, 'post', function (res) {
                    console.log(res);
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            if (i == 0) {
@@ -1337,12 +1342,14 @@
            //初始化渲单据的计划数量和完成数量
            function updateQtyList2() {
                clear23();
                console.log("AA");
                var param = {
                    SoDetailId: $("#skuLotNo2").val(),
                };
                synData(IP + "/PdaSo/GetPlanAndFinishQty", param, 'post', function (res) {
                    console.log(res);
                    console.log(res.data);
                    if (res.code == 0) { //成功
                        console.log(res.data);
                        $("#planQty2").val(res.data.PlanQty)
                        $("#finishQty2").val(res.data.FinishQty)
                    } else { //不成功
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
@@ -7,10 +7,10 @@
    public class OutPdaInfo
    {
        public string OutModel { get; set; }                     // 拣货区(出库口)
        public decimal PlanQty { get; set; }                       // 计划数量
        public decimal? PlanQty { get; set; }                       // 计划数量--
        public decimal? FinishQty { get; set; }                       // 完成数量
        public string Standard { get; set; }                       // 规格
        public decimal PickQty { get; set; }                       // 托盘待拣数量
        public decimal? PickQty { get; set; }                       // 托盘待拣数量--
        public decimal? PickedQty { get; set; }                       // 托盘已拣数量
        public string SkuNo { get; set; }                           // 物料编号
    }
Wms/Model/ModelVm/BllTaskVm/TaskSyncInfoVm.cs
@@ -102,9 +102,9 @@
        /// <summary>
        /// 箱支信息
        /// </summary>
        public List<BoxInfo> BoxInfoList { get; set; }
        public List<BoxInfosVm> BoxInfoList { get; set; }
    }
    public class BoxInfo
    public class BoxInfosVm
    { 
        public string OrderCode { get; set; }
        public string BoxNo { get; set; }
Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs
@@ -476,20 +476,20 @@
                        // 正式运行程序放开
                        var list2 = outWhs.Select(m => m.TaskNo).ToList();
                        var jsonData = JsonConvert.SerializeObject(outWhs);
                        string response = "";
                        //string response = "";
                        try
                        {
                            var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                            response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                            var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
                            //var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
                            //response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                            //var time2 = DateTime.Now;//返回时间 .ToString("yyyy-MM-dd HH:mm:ss")
                            ////解析返回数据 
                            //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                            //if (wcsModel.StatusCode == 0)
                            //{
                            //    //更改任务的发送返回时间//
                                new TaskServer().EditTaskIssueOk(list2, time1, time2);
                                //new TaskServer().EditTaskIssueOk(list2, time1, time2);
                            //}
                            //if (wcsModel.StatusCode == -1)
                            //{
Wms/Wms/Controllers/PdaSoController.cs
@@ -10,7 +10,6 @@
using Model.ModelVm.PdaVm;
using WMS.IBLL.IPdaServer;
using Model.ModelDto;
using Model.ModelVm;
using Wms.Tools;
using Utility;
using System.Security.Cryptography;
@@ -65,9 +64,9 @@
        /// <param name="model">PalletNo:托盘码、SoNo:单据号</param> 
        /// <returns></returns>
        [HttpPost]
        public async Task GetSoSkuLotNoListByPallet(PdaSoVm model)
        public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(PdaSoVm model)
        {
            var models = await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
           return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
        }
        /// <summary>
@@ -89,18 +88,20 @@
        [HttpPost]
        public async Task<OutPdaInfo> GetPlanAndFinishQty(PdaSoVm model)
        {
            return await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
            var data = await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
            return data;
        }
        /// <summary>
        /// 获取箱码信息(根据箱码在库存箱码明细中查询)
        /// </summary>
        /// <param name="model">BoxNo:箱码号</param>
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<dynamic> GetDataComBoxInfo(PdaSoVm model)
        public async Task<List<BoxInfo>> GetDataComBoxInfo(PdaSoVm model)
        {
            return await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
            var data = await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
            return data;
        }
        /// <summary>
@@ -109,7 +110,7 @@
        /// <param name="model">BoxNo:箱码号</param> 
        /// <returns></returns>
        [HttpPost]
        public async Task<dynamic> GetAllotPlnInfo(PdaSoVm model)
        public async Task<List<BoxInfo>> GetAllotPlnInfo(PdaSoVm model)
        {
            return await _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
        }
Wms/Wms/appsettings.json
@@ -12,7 +12,7 @@
    //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC26;User ID=sa;Password=sql2019;Integrated Security=False;",
    "ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC26;User ID=sa;Password=admin2023@;Integrated Security=False;"
    "ConnectionString": "Server=.;Database=WMS_JC26;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
  },
@@ -47,7 +47,7 @@
  },
  "Quartz": {
    "dbProviderName": "SqlServer",
    "connectionString": "Server=.\\MSSQLSERVER2019;Database=QRTZ;User ID=sa;Password=admin2023@;Integrated Security=False;"
    "connectionString": "Server=.;Database=QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
  }