From c90d69ef8c115f0fff54edb3a1e06945215e14e9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 02 三月 2024 16:56:18 +0800
Subject: [PATCH] 出库流程修改
---
HTML/views/SOSetting/ExportNoticeAddFrom.html | 92 ++++++++++++++++++++++++------
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 58 +++++++++---------
2 files changed, 103 insertions(+), 47 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 0cd8b39..7955b10 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -32,7 +32,7 @@
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-verify="required" lay-search>
- <option value=""></option>
+ <!-- <option value=""></option> -->
<!-- 24 -->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
@@ -56,7 +56,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>
@@ -125,6 +125,7 @@
};
var arr = [];
+ var TypeValue=$("#Type").val();
function refreshTable(data) {
//table.clear();
@@ -334,6 +335,19 @@
isrun = 0;
return;
}
+ var type= $("#Type").val();
+ if(type=='6'){
+ var CustomerNo=$("#CustomerNo").val();
+ if(CustomerNo==''){
+ layer.msg("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
+ });
+ return;
+ }
+ }
var DataList = [];
console.log(infoOptions.data);
for (var i in infoOptions.data) {
@@ -429,19 +443,16 @@
//涓嬫媺鍗曟嵁绫诲瀷閫変腑鍚庝簨浠�
- // form.on('select(Type)', function(data) {
- // // console.log(data.value);
- // if (data.value == "0" || data.value == "1") { //閿�鍞嚭搴�
- // $("#chengyunshang").removeClass("isNoShow");
- // $("#chengyunshang").addClass("isShow");
- // form.render('select');
- // }else if(data.value == "2" ||data.value == "3"){//涓嶅悎鏍煎嚭搴�
-
- // $("#chengyunshang").removeClass("isShow");
- // $("#chengyunshang").addClass("isNoShow");
- // form.render('select');
- // }
- // });
+ form.on('select(Type)', function(data) {
+ var value = data.value;
+ if(value!=TypeValue){
+ getCustomerList();
+ arr = [];
+ // 娓叉煋Table
+ refreshTable(null);
+ TypeValue=value;
+ }
+ });
//鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
// function getWareHouseList(){
// sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
@@ -470,9 +481,54 @@
$("#CustomerNo").empty();
$("#CustomerNo").append('<option value =""></option>');
for (var i = 0; i < res.data.length; i++) {
- $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
- res.data[i].CustomerName + '</option>');
- }
+ 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": //鍏朵粬鍑哄簱
+ TypeNum = 2;
+ console.log(TypeNum)
+ break;
+ }
+ //鍒ゆ柇鍗曟嵁绫诲瀷
+ if (TypeNum == 0)
+ {
+ if (res.data[i].Type == 0)
+ {
+ $("#CustomerNamep").html("瀹㈡埛");
+ $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ else if (TypeNum == 1)
+ {
+ if (res.data[i].Type == 1)
+ {
+ $("#CustomerNamep").html("渚涘簲鍟�");
+ $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ else if (TypeNum == 2)
+ {
+ if (res.data[i].Type == 2)
+ {
+ $("#CustomerNamep").html("璐т富");
+ $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+ res.data[i].CustomerName + '</option>');
+ }
+ }
+ }
form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 4e36e9f..e09c0ca 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -325,38 +325,38 @@
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)); //鎺掗櫎绌烘墭鐩樼殑鐗╂枡闆嗗悎
- var inspectStatus = "1";//搴撳瓨鍐呯墿鏂欑殑璐ㄦ鐘舵��
- var skuTypeC = new List<string>() { "0" };//鏍囧噯
- var skuTypeY = new List<string>() { "1" };//闈炴爣
- if (type == "0" || type == "2") //鏍囧噯
+ string skuType = string.Empty;
+ switch (type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
{
- inspectStatus = "0";
- //if (type == "0") //鎴愬搧
- //{
- skuList = sku.Where(m => inspectStatus==m.IsControlled).Select(m => m.SkuNo).ToList();
- //}
-
- //if (type == "1") //鍘熸枡
- //{
- // skuList = sku.Where(m => skuTypeY.Contains(m.Type)).Select(m => m.SkuNo).ToList();
- //}
+ case "0"://鎴愬搧鍏ュ簱
+ skuType = "(2)";
+ break;
+ case "1"://棰嗘枡鍑哄簱
+ skuType = "(0,1,3)";
+ break;
+ case "2"://鎶芥鍑哄簱
+ skuType = "(2)";
+ break;
+ case "3"://鐗╂枡鍙栨牱鍑哄簱
+ skuType = "(0)";
+ break;
+ case "4"://涓嶅悎鏍煎搧鍑哄簱
+ skuType = "(2)";
+ break;
+ case "5"://涓棿鍝佸嚭搴�
+ skuType = "(4)";
+ break;
+ case "6"://浠ｅ偍鍑哄簱
+ skuType = "(2)";
+ break;
+ default: //鍏跺畠鍑哄簱
+ skuType = "(0,1,2,3,4)";
+ break;
}
- else if (type == "1" || type == "3") //闈炴爣
+ skuList = sku.Where(m => skuType.Contains(m.Type)).Select(m => m.SkuNo).ToList();
+ if (skuList == null)
{
- inspectStatus = "1";
- //if (type == "2") //鎴愬搧
- //{
- skuList = sku.Where(m => inspectStatus==m.IsControlled).Select(m => m.SkuNo).ToList();
- //}
-
- //if (type == "3") //鍘熸枡
- //{
- // skuList = sku.Where(m => skuTypeY.Contains(m.Type)).Select(m => m.SkuNo).ToList();
- //}
- }
- else
- {
- throw new Exception("鍗曟嵁鐘舵�佹湁璇�");
+ throw new Exception("鏈煡鍒板搴斿嚭搴撶被鍨嬬殑鐗╂枡");
}
//skuList = sku.Select(m => m.SkuNo).ToList();
var stockRst = new StockServer();
--
Gitblit v1.8.0