JC24WMS.git - Gitblit

parent: 1401f015 | 补丁 | 提交 | show whitespace

yuyou_x

2024-03-26 5b4f00ff3ea04a3246a8f6f86bdefe749fcfd0c4

合并代码

5个文件已修改

	HTML/js/public.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/FlatLibraryLegend.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/StorageLegend.html	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 HTML/js/public.js

@@ -1,11 +1,11 @@
//var IP = "http://47.104.149.73:1991";//接口IP
// var IP = "http://172.16.71.101:8082/";//接口IP
//var IP = "http://localhost:13243/api";
// var IP = "http://localhost:50515/api";
var IP = "http://localhost:50515/api";  //本地
// var IP = "http://localhost:44318/api";
//var IP = "http://192.168.1.6:8017";
//var IP = "http://192.168.1.226:8086";  
var IP = "http://192.168.62.200:8888/api";  
// var IP = "http://192.168.62.200:8888/api";  //bkl服务器

var pageCnt = 15;
var pageLimits = [10, 15, 20, 30, 50, 70, 100];

 HTML/views/WareHouseSetting/FlatLibraryLegend.html

@@ -1056,6 +1056,7 @@
            });
            //定时器
            setInterval(function(){
                // console.info(1)
                if(autoRefresh){
                    GetSlotVm($("#WareHouseNo").val(), $("#Row").val());    
                    //var currentDate = new Date();

 HTML/views/WareHouseSetting/StorageLegend.html

@@ -369,11 +369,11 @@
                    $("#Row").empty();//清空上一个查询下拉值
                    $("#Row option[value ='19']").attr("selected", "selected")
                    $("#Row").append('<option value =19>第19排</option>');
                    $("#Row").append('<option value =>第20排</option>');
                    $("#Row").append('<option value =20>第20排</option>');
                    form.render('select');
                }
                GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val())

                funLayer();
                GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
                GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
                
            })
@@ -397,6 +397,24 @@
            form.on('select(SelectDepth)', function (data) {
                GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
            });
            function funLayer()
            {
                if($("#Row").val() == "2" || $("#Row").val() == "5" || $("#Row").val() == "9" || $("#Row").val() == "13" || $("#Row").val() == "17")
                {
                    $("#Depth").empty();//清空上一个查询下拉值
                    $("#Depth option[value ='01']").attr("selected", "selected")
                    $("#Depth").append('<option value =01>深度1</option>');
                }
                else
                {
                    $("#Depth").empty();//清空上一个查询下拉值
                    $("#Depth option[value ='01']").attr("selected", "selected")
                    $("#Depth").append('<option value =01>深度1</option>');
                    $("#Depth").append('<option value =02>深度2</option>');
                }
                form.render('select');
                GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
            }

            //获取仓库巷道
            function getRoadway() {
@@ -507,9 +525,12 @@
                            xiangb = "巷道20排";
                            $("#Row option[value ='19']").attr("selected", "selected")
                            $("#Row").append('<option value =19>第19排</option>');
                            $("#Row").append('<option value =>第20排</option>');
                            $("#Row").append('<option value =20>第20排</option>');
                            form.render('select');
                        }
                        funLayer();
                        GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
                        GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -452,7 +452,7 @@
                    var comList = new List<BllCompleteDetail>();
                    foreach (var item in boxInfos)
                    {
                        if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
                        if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
                        {
                            throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
                        }

 Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs

@@ -506,7 +506,8 @@
                    SkuName = it.SkuName,
                    LotNo = it.LotNo,
                    Standard = it.Standard,
                    Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty
                    //Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty,
                    Qty = it.Qty - it.LockQty - it.FrozenQty,

                }).ToList();

@@ -2548,6 +2549,38 @@
                    {
                        throw new Exception("未查询到任务信息");
                    }
                    //获取对应库位信息
                    var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
                    if (startlocat == null)
                    {
                        throw new Exception("未查询到储位信息");
                    }
                    startlocat.Status = "0";//修改分配信息状态
                    //获取储位信息
                    var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
                    //获取移库任d务对应目标储位信息
                    SysStorageLocat endlocat = new SysStorageLocat();
                    if (task.Type == "2")
                    {
                        endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.EndLocat);
                        if (endlocat == null)
                        {
                            throw new Exception("未查询到目标储位信息");
                        }
                    }
                    if (locat == null)
                    {
                        Db.RollbackTran();
                        throw new Exception("未查询到储位信息，请核实！");
                    }
                    locat.Status = "1"; //有物品
                    Db.Updateable(locat).ExecuteCommand();
                    if (endlocat != null)
                    {
                        endlocat.Status = "0"; //空储位 0
                        Db.Updateable(endlocat).ExecuteCommand();
                    }

                    //修改任务 
                    task.IsSuccess = 1;
                    task.IsSend = 0;
@@ -2571,31 +2604,6 @@

                        noticeDetail.FactQty -= item.Qty; //修改出库单明细的下架数量
                        Db.Updateable(noticeDetail).ExecuteCommand();

                        //获取储位信息
                        var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
                        //获取移库任务对应目标储位信息
                        SysStorageLocat endlocat = new SysStorageLocat();
                        if (task.Type == "2")
                        {
                            endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W03" && a.LocatNo == task.EndLocat);
                            if (endlocat == null)
                            {
                                throw new Exception("未查询到目标储位信息");
                            }
                        }
                        if (locat == null)
                        {
                            Db.RollbackTran();
                            throw new Exception("未查询到储位信息，请核实！");
                        }
                        locat.Status = "1"; //有物品
                        Db.Updateable(locat).ExecuteCommand();
                        if (endlocat != null)
                        {
                            endlocat.Status = "0"; //空储位 0
                            Db.Updateable(endlocat).ExecuteCommand();
                        }

                        if (noticeDetail.FactQty == 0)
                        {

			@@ -1,11 +1,11 @@
			//var IP = "http://47.104.149.73:1991";//接口IP
			// var IP = "http://172.16.71.101:8082/";//接口IP
			//var IP = "http://localhost:13243/api";
			// var IP = "http://localhost:50515/api";
			var IP = "http://localhost:50515/api"; //本地
			// var IP = "http://localhost:44318/api";
			//var IP = "http://192.168.1.6:8017";
			//var IP = "http://192.168.1.226:8086";
			var IP = "http://192.168.62.200:8888/api";
			// var IP = "http://192.168.62.200:8888/api"; //bkl服务器

			var pageCnt = 15;
			var pageLimits = [10, 15, 20, 30, 50, 70, 100];

			@@ -1056,6 +1056,7 @@
			});
			//定时器
			setInterval(function(){
			// console.info(1)
			if(autoRefresh){
			GetSlotVm($("#WareHouseNo").val(), $("#Row").val());
			//var currentDate = new Date();

			@@ -369,11 +369,11 @@
			$("#Row").empty();//清空上一个查询下拉值
			$("#Row option[value ='19']").attr("selected", "selected")
			$("#Row").append('<option value =19>第19排</option>');
			$("#Row").append('<option value =>第20排</option>');
			$("#Row").append('<option value =20>第20排</option>');
			form.render('select');
			}
			GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val())

			funLayer();
			GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
			GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());

			})
			@@ -397,6 +397,24 @@
			form.on('select(SelectDepth)', function (data) {
			GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
			});
			function funLayer()
			{
			if($("#Row").val() == "2" \|\| $("#Row").val() == "5" \|\| $("#Row").val() == "9" \|\| $("#Row").val() == "13" \|\| $("#Row").val() == "17")
			{
			$("#Depth").empty();//清空上一个查询下拉值
			$("#Depth option[value ='01']").attr("selected", "selected")
			$("#Depth").append('<option value =01>深度1</option>');
			}
			else
			{
			$("#Depth").empty();//清空上一个查询下拉值
			$("#Depth option[value ='01']").attr("selected", "selected")
			$("#Depth").append('<option value =01>深度1</option>');
			$("#Depth").append('<option value =02>深度2</option>');
			}
			form.render('select');
			GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
			}

			//获取仓库巷道
			function getRoadway() {
			@@ -507,9 +525,12 @@
			xiangb = "巷道20排";
			$("#Row option[value ='19']").attr("selected", "selected")
			$("#Row").append('<option value =19>第19排</option>');
			$("#Row").append('<option value =>第20排</option>');
			$("#Row").append('<option value =20>第20排</option>');
			form.render('select');
			}
			funLayer();
			GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
			GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
			} else { //不成功
			layer.msg(res.msg, {
			icon: 2,

			@@ -452,7 +452,7 @@
			var comList = new List<BllCompleteDetail>();
			foreach (var item in boxInfos)
			{
			if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
			if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
			{
			throw new Exception($"当前{item.BoxNo}中{item.BoxNo3}已拣货完成，请勿重复拣货");
			}

			@@ -506,7 +506,8 @@
			SkuName = it.SkuName,
			LotNo = it.LotNo,
			Standard = it.Standard,
			Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty
			//Qty = type == "4" ? it.Qty : it.Qty - it.LockQty - it.FrozenQty,
			Qty = it.Qty - it.LockQty - it.FrozenQty,

			}).ToList();

			@@ -2548,6 +2549,38 @@
			{
			throw new Exception("未查询到任务信息");
			}
			//获取对应库位信息
			var startlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
			if (startlocat == null)
			{
			throw new Exception("未查询到储位信息");
			}
			startlocat.Status = "0";//修改分配信息状态
			//获取储位信息
			var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
			//获取移库任d务对应目标储位信息
			SysStorageLocat endlocat = new SysStorageLocat();
			if (task.Type == "2")
			{
			endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.EndLocat);
			if (endlocat == null)
			{
			throw new Exception("未查询到目标储位信息");
			}
			}
			if (locat == null)
			{
			Db.RollbackTran();
			throw new Exception("未查询到储位信息，请核实！");
			}
			locat.Status = "1"; //有物品
			Db.Updateable(locat).ExecuteCommand();
			if (endlocat != null)
			{
			endlocat.Status = "0"; //空储位 0
			Db.Updateable(endlocat).ExecuteCommand();
			}

			//修改任务
			task.IsSuccess = 1;
			task.IsSend = 0;
			@@ -2571,31 +2604,6 @@

			noticeDetail.FactQty -= item.Qty; //修改出库单明细的下架数量
			Db.Updateable(noticeDetail).ExecuteCommand();

			//获取储位信息
			var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W01" && a.LocatNo == task.StartLocat);
			//获取移库任务对应目标储位信息
			SysStorageLocat endlocat = new SysStorageLocat();
			if (task.Type == "2")
			{
			endlocat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W03" && a.LocatNo == task.EndLocat);
			if (endlocat == null)
			{
			throw new Exception("未查询到目标储位信息");
			}
			}
			if (locat == null)
			{
			Db.RollbackTran();
			throw new Exception("未查询到储位信息，请核实！");
			}
			locat.Status = "1"; //有物品
			Db.Updateable(locat).ExecuteCommand();
			if (endlocat != null)
			{
			endlocat.Status = "0"; //空储位 0
			Db.Updateable(endlocat).ExecuteCommand();
			}

			if (noticeDetail.FactQty == 0)
			{