From 6c67149e3a6c45b17b4b82640c9f9fb949488e02 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 08 三月 2024 14:59:56 +0800
Subject: [PATCH] 代储类型出入库流程测试并修改测试问题
---
HTML/views/SOSetting/ExportNoticeEditFrom.html | 64 +++++++++++++++++--------------
HTML/views/SOSetting/ExportNoticeAddFrom.html | 13 ++++++
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 21 +++++++---
HTML/views/SOSetting/ExportSelectSkuFrom.html | 1
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 2
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 13 ++++++
Wms/Wms/Controllers/BllSoController.cs | 2
Wms/Model/ModelVm/BllSoVm/ExportNoticeVm.cs | 1
8 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 62b4982..c3808e1 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -274,10 +274,21 @@
},function() {});
return;
}
+ if($("#Type").val()=='6'){
+ if($("#CustomerNo").val()==''){
+ layer.msg("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
+ });
+ return;
+ }
+ }
layer.open({
type: 2,
title: '閫夋嫨鐗╁搧淇℃伅',
- content: 'ExportSelectSkuFrom.html?Type='+$("#Type").val(),
+ content: 'ExportSelectSkuFrom.html?Type='+$("#Type").val()+'&OwnerNo='+$("#CustomerNo").val(),
maxmin: true,
area: ['950px', '90%'],
fixed: false,
diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index a0d29de..cd22bba 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -51,7 +51,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+ <label class="layui-form-label" id="CustomerNamep">瀹㈡埛鍚嶇О</label>
<div class="layui-input-inline">
<select name="CustomerNo" id="CustomerNo" lay-search>
<option value=""></option>
@@ -116,9 +116,8 @@
console.log(soNo);
console.log(id);
// getWareHouseList();
- getCustomerList();
- getLogisticsInfoList();
- getData();
+
+ getData();//鑾峰彇鍏ュ簱鍗曠被鍨�
var arr = [];
window.success = function(data) {
refreshTable(data);
@@ -437,11 +436,16 @@
if(res.code == 0){
console.log(res.data);
$("#Type option[value='"+ res.data.Type+"']").attr("selected", "selected")
- $("#CustomerNo option[value='"+ res.data.CustomerNo+"']").attr("selected", "selected")
- $("#LogisticsId option[value='"+ res.data.LogisticsId+"']").attr("selected", "selected")
+
+
form.render('select');
refreshTable(res.data.Detail);
+
+ //鑾峰彇瀹㈡埛/璐т富
+ getCustomerList(res.data.CustomerNo);
+ //鑾峰彇渚涘簲鍟�
+ getLogisticsInfoList(res.data.LogisticsId);
}
else{
layer.msg(res.msg, {
@@ -488,32 +492,32 @@
// });
// }
//鑾峰彇瀹㈡埛涓嬫媺妗嗕俊鎭�
- function getCustomerList() {
+ function getCustomerList(customerNo) {
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
+ var TypeNum = 0;
+
+ switch($("#Type").val())
+ {
+ case "0": //鎴愬搧鍑哄簱
+ TypeNum = 0;
+ console.log(TypeNum)
+ break;
+ case "1": //棰嗘枡鍑哄簱
+ case "2": //鎶芥鍑哄簱
+ case "3": //鐗╂枡鍙栨牱鍑哄簱
+ case "4": //涓嶅悎鏍煎搧鍑哄簱
+ case "5": //涓棿鍝佸嚭搴�
+ case "6": //浠ｅ偍鍑哄簱
+ case "7": //鍏朵粬鍑哄簱
+ case "8": //瀵勫瓨鍑哄簱
+ TypeNum = 2;
+ console.log('TypeNum:'+ TypeNum)
+ break;
+ }
$("#CustomerNo").empty();
$("#CustomerNo").append('<option value =""></option>');
- for (var i = 0; i < res.data.length; i++) {
- var TypeNum = 0;
-
- switch($("#Type").val())
- {
- case "0": //鎴愬搧鍑哄簱
- TypeNum = 0;
- console.log(TypeNum)
- break;
- case "1": //棰嗘枡鍑哄簱
- case "2": //鎶芥鍑哄簱
- case "3": //鐗╂枡鍙栨牱鍑哄簱
- case "4": //涓嶅悎鏍煎搧鍑哄簱
- case "5": //涓棿鍝佸嚭搴�
- case "6": //浠ｅ偍鍑哄簱
- case "7": //鍏朵粬鍑哄簱
- case "8": //瀵勫瓨鍑哄簱
- TypeNum = 2;
- console.log(TypeNum)
- break;
- }
+ for (var i = 0; i < res.data.length; i++) {
//鍒ゆ柇鍗曟嵁绫诲瀷
if (TypeNum == 0)
{
@@ -543,6 +547,7 @@
}
}
}
+ $("#CustomerNo option[value='"+ customerNo +"']").attr("selected", "selected")
form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -553,7 +558,7 @@
});
}
//鑾峰彇鐗╂祦鎵胯繍鍟嗕笅鎷夋淇℃伅
- function getLogisticsInfoList() {
+ function getLogisticsInfoList(logisticsId) {
sendData(IP + "/Basis/GetLogisticsInfoSelect", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
$("#LogisticsId").empty();
@@ -562,6 +567,7 @@
$("#LogisticsId").append('<option value =' + res.data[i].Id + '>' +
res.data[i].CarrierName + '</option>');
}
+ $("#LogisticsId option[value='"+logisticsId +"']").attr("selected", "selected")
form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
diff --git a/HTML/views/SOSetting/ExportSelectSkuFrom.html b/HTML/views/SOSetting/ExportSelectSkuFrom.html
index e6019ae..494c653 100644
--- a/HTML/views/SOSetting/ExportSelectSkuFrom.html
+++ b/HTML/views/SOSetting/ExportSelectSkuFrom.html
@@ -78,6 +78,7 @@
var param = {
WareHouseNo:getQueryString('houseId'),
Type:getQueryString('Type'),
+ OwnerNo:getQueryString('OwnerNo'),
Msg: $("#Msg").val(),
};
table.render({
diff --git a/Wms/Model/ModelVm/BllSoVm/ExportNoticeVm.cs b/Wms/Model/ModelVm/BllSoVm/ExportNoticeVm.cs
index f3f9cfd..374dc66 100644
--- a/Wms/Model/ModelVm/BllSoVm/ExportNoticeVm.cs
+++ b/Wms/Model/ModelVm/BllSoVm/ExportNoticeVm.cs
@@ -24,6 +24,7 @@
{
public string WareHouseNo { get; set; }
public string Type { get; set; }
+ public string OwnerNo { get; set; }
public string Msg { get; set; }
}
public class AddEditExportNoticeVm
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 25171fc..235c1e3 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -845,8 +845,21 @@
int isDel = 0;
//鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+ stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
stockDetail.Qty -= int.Parse(PickQty);
stockDetail.LockQty -= int.Parse(PickQty);
+ if (stockDetail.Qty == stockDetail.LockQty)
+ {
+ stockDetail.Status = "2";
+ }
+ else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+ {
+ stockDetail.Status = "1";
+ }
+ else
+ {
+ stockDetail.Status = "0";
+ }
if (stockDetail.Qty <= 0)
{
Db.Deleteable(stockDetail).ExecuteCommand();
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 08845ff..913650b 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -331,10 +331,18 @@
}
}
- public List<ExStockInfoDto> GetStockGroupList(string type, string msg)
+ public List<ExStockInfoDto> GetStockGroupList(string type, string ownerNo, string msg)
{
try
{
+ if (string.IsNullOrEmpty(type))
+ {
+ throw new Exception("璇烽�夋嫨鍑哄簱鍗曠被鍨�");
+ }
+ if (type == "6" && string.IsNullOrEmpty(ownerNo))
+ {
+ throw new Exception("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富");
+ }
var plnList = new List<string>() { "100099" };
var skuList = new List<string>();
var sku = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0" && !plnList.Contains(m.SkuNo)); //鎺掗櫎绌烘墭鐩樼殑鐗╂枡闆嗗悎
@@ -342,7 +350,7 @@
string inspectStatus = string.Empty;
switch (type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
{
- case "0"://鎴愬搧鍏ュ簱
+ case "0"://鎴愬搧鍑哄簱
skuType = "(2)";
inspectStatus = "1";
break;
@@ -368,15 +376,15 @@
break;
case "6"://浠ｅ偍鍑哄簱
skuType = "(0,1,2,3)";
- inspectStatus = "0";
+ inspectStatus = "0,1";
break;
case "8"://瀵勫瓨鍑哄簱
skuType = "(0,1,2,3)";
- inspectStatus = "0";
+ inspectStatus = "0,1";
break;
default: //鍏跺畠鍑哄簱
skuType = "(0,1,2,3,4)";
- inspectStatus = "0";
+ inspectStatus = "0,1";
break;
}
skuList = sku.Where(m => skuType.Contains(m.Type)).Select(m => m.SkuNo).ToList();
@@ -391,6 +399,7 @@
//.And(it => it.WareHouseNo == wareHouseNo)
.AndIF(!string.IsNullOrWhiteSpace(inspectStatus), it => inspectStatus.Contains(it.InspectStatus))
.And(m => skuList.Contains(m.SkuNo))
+ .AndIF(type == "6", m => m.OwnerNo == ownerNo)//浠ｅ偍鍑哄簱闇�瑕佸叧鑱旇揣涓�
.AndIF(!string.IsNullOrWhiteSpace(msg), it => (it.SkuNo.Contains(msg) || it.SkuName.Contains(msg) || it.LotNo.Contains(msg)))
.And(it => (it.Qty - it.LockQty - it.FrozenQty) > 0)
.And(it => (it.Status == "0" || it.Status == "1"))
@@ -2577,7 +2586,7 @@
}
else if (notice.Type == "3" || notice.Type == "5" || notice.Type == "6" || notice.Type == "7" || notice.Type == "8")//鍙栨牱鍑哄簱
{
- stockDetail = stockDetail.Where(m => m.InspectStatus == "0").ToList();
+ stockDetail = stockDetail.Where(m => m.InspectStatus == "0" || m.InspectStatus == "1").ToList();
}
else if (notice.Type == "4")//涓嶅悎鏍煎嚭搴�
{
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index b5bd275..d481333 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -49,7 +49,7 @@
/// <param name="type">绫诲瀷</param>
/// <param name="msg">鐗╂祦缂栫爜銆佸悕绉般�佹壒娆�</param>
/// <returns></returns>
- List<ExStockInfoDto> GetStockGroupList( string type, string msg);
+ List<ExStockInfoDto> GetStockGroupList( string type, string ownerNo, string msg);
/// <summary>
/// 娣诲姞鍑哄簱鍗�
/// </summary>
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index a63e4d6..489c5f2 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -72,7 +72,7 @@
{
try
{
- var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.Msg);
+ var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.OwnerNo,model.Msg);
return Ok(new { code = 0, count=0, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
}
--
Gitblit v1.8.0