From 764fb76eb4a710e217a947abb443801a0a5016a0 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 15 八月 2024 15:40:44 +0800
Subject: [PATCH] 业务流程测试
---
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs | 4 ++--
Wms/Model/ModelVm/BllTaskVm/TaskSyncInfoVm.cs | 4 ++--
Wms/Wms/appsettings.json | 4 ++--
Wms/Wms/Controllers/PdaSoController.cs | 17 +++++++++--------
Pda/View/SoSetting/pinTuoOut.html | 13 ++++++++++---
Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs | 10 +++++-----
6 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/Pda/View/SoSetting/pinTuoOut.html b/Pda/View/SoSetting/pinTuoOut.html
index c06d395..982a286 100644
--- a/Pda/View/SoSetting/pinTuoOut.html
+++ b/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 { //涓嶆垚鍔�
diff --git a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
index d7af22e..6ae7ac9 100644
--- a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
+++ b/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; } // 鐗╂枡缂栧彿
}
diff --git a/Wms/Model/ModelVm/BllTaskVm/TaskSyncInfoVm.cs b/Wms/Model/ModelVm/BllTaskVm/TaskSyncInfoVm.cs
index dd0f540..f22756a 100644
--- a/Wms/Model/ModelVm/BllTaskVm/TaskSyncInfoVm.cs
+++ b/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; }
diff --git a/Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs b/Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs
index 19db4a1..616764b 100644
--- a/Wms/WMS.BLL/BllQualityServer/InspectionRequestServer.cs
+++ b/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, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "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, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "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)
//{
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 006663b..0056a0e 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/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:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</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);
}
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index b5ce370..6de1f01 100644
--- a/Wms/Wms/appsettings.json
+++ b/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;"
}
--
Gitblit v1.8.0