去掉入库单和出库单验证

wxw

2025-02-11 415e713b444fccc25e59ff0e1b5d72467ec20b54

去掉入库单和出库单验证

 HTML/views/HouseWithinSetting/CRLogTask.html

@@ -309,6 +309,11 @@
                        width: 110,
                        align: 'center',
                    }, {
                        field: 'LotNo',
                        title: '批次号',
                        width: 110,
                        align: 'center',
                    }, {
                        field: 'StartLocat',
                        title: '起始位置',
                        width: 100,

 HTML/views/QualityControl/QualityInformation.html

@@ -36,7 +36,7 @@
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 60px;">批次号</label>
                            <div class="layui-input-inline">
                                <input type="text" id="LotNo" name="LotNo" placeholder="请输入物料名称" autocomplete="off" class="layui-input">
                                <input type="text" id="LotNo" name="LotNo" placeholder="请输入批次号" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <!-- 物料号 -->

 HTML/views/QualityControl/QualityInformationFrom.html

@@ -22,10 +22,18 @@
                    <input type="text" name="ASNNo" placeholder="请输入入库单号" autocomplete="off" class="layui-input">
                </div>
            </div> -->
            <div class="layui-form-item">
            <!-- <div class="layui-form-item">
                <label class="layui-form-label">批次号</label>
                <div class="layui-input-block" style="width: 70%;">
                    <input type="text" name="LotNo" placeholder="请输入批次号" lay-verify="required" autocomplete="off" class="layui-input">
                </div>
            </div> -->
            <div class="layui-form-item">
                <label class="layui-form-label">批次号</label>
                <div class="layui-input-block" style="width: 70%;">
                    <select name="LotNo" id="LotNo" lay-filter="LotNo" lay-verify="">
                        <option value=""></option>
                    </select>
                </div>
            </div>
            <!-- <div class="layui-form-item">
@@ -72,6 +80,23 @@
                    if (r != null) return unescape(r[2]);
                    return null;
                }

                //获取批次下拉框信息
                sendData(IP + "/BllQuality/GetLotNoList", {}, 'get', function(res) {
                    if (res.code == 0) { //成功
                    for (var i = 0; i < res.data.length; i++) {
                        $("#LotNo").append('<option value =' + res.data[i].LotNo + '>' + res.data[i].LotNo + '</option>');
                    }
					
                    form.render('select');
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function() {});
                    }
                });
				
        </script>
    </body>
</html>

 Wms/Model/ModelDto/LogDto/TaskDto.cs

@@ -98,6 +98,11 @@
        public string Type { get; set; }

        /// <summary>
        /// Desc:批次号
        /// </summary> 
        public string LotNo { get; set; }

        /// <summary>
        /// Desc:取消时间
        /// Default:
        /// Nullable:True

 Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs

@@ -134,6 +134,23 @@
            return isquality;
        }

        /// <summary>
        /// 获取库存批次号集合
        /// </summary>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public List<DataStockDetail> GetLotNoList()
        {
            try
            {
                var _list = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && !string.IsNullOrEmpty(w.LotNo)).ToList();
                return _list;
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }
        #endregion

    }

 Wms/WMS.BLL/BllTransServer/RcsServer.cs

@@ -150,7 +150,7 @@
                            }
                            noticeNo = soNoticeDetail.Id.ToString();
                            //出库总单
                            var soNotice = Db.Queryable<BllExportNotice>().Where(w => w.IsDel == "0" && w.SONo == soNoticeDetail.SONo).First();
                            /*var soNotice = Db.Queryable<BllExportNotice>().Where(w => w.IsDel == "0" && w.SONo == soNoticeDetail.SONo).First();
                            if (soNotice == null)
                            {
                                throw new Exception("该批次没有对应的出库单");
@@ -158,7 +158,7 @@
                            soNotice.Status = "3";//正在执行
                            soNotice.UpdateTime = DateTime.Now;
                            //更新出库单
                            Db.Updateable(soNotice).ExecuteCommand();
                            Db.Updateable(soNotice).ExecuteCommand();*/

                            //查找到该车间半成品区
                            List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
@@ -259,6 +259,7 @@
                                    Status = "0",//任务状态0：等待执行1正在执行2执行完成
                                    NoticeDetailNo = int.Parse(noticeNo),
                                    Msg = taskMsg, //关键信息
                                    LotNo = item.LotNo//批次号
                                };
                                //组织下发小车任务信息
                                var task2 = new TaskDetial
@@ -332,6 +333,7 @@
                    Status = "0",//任务状态0：等待执行1正在执行2执行完成
                    NoticeDetailNo = int.Parse(noticeNo),
                    Msg = taskMsg, //关键信息
                    LotNo = pallet.LotNo//批次号
                };

                //组织下发小车任务信息
@@ -519,7 +521,7 @@
                                throw new Exception("批次号为空！");
                            }
                            //校验此批次是否有入库单
                            var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().Where(w => w.IsDel == "0" && w.Status == "0" && w.LotNo == model.LotNo).OrderByDescending(o => o.CreateTime).First();
                            /*var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().Where(w => w.IsDel == "0" && w.Status == "0" && w.LotNo == model.LotNo).OrderByDescending(o => o.CreateTime).First();
                            if (noticeDetail == null)
                            {
                                throw new Exception("该批次没有对应的入库单明细");
@@ -533,7 +535,7 @@
                            }
                            notice.Status = "1";//正在执行
                            //更新入库单状态
                            Db.Updateable(notice).ExecuteCommand();
                            Db.Updateable(notice).ExecuteCommand();*/

                            //查找到该车间半成品区
                            loction = GetLocatModel(houseNo, "2");
@@ -612,6 +614,7 @@
                    Status = "0",//任务状态0：等待执行1正在执行2执行完成
                    NoticeDetailNo = int.Parse(noticeno),
                    Msg = taskMsg, //关键信息
                    LotNo = palletInfo.LotNo//批次号
                };
                var task = new TaskDetial
                {

 Wms/WMS.BLL/LogServer/TaskServer.cs

@@ -37,8 +37,8 @@
                    .ToExpression();//注意 这一句 不能少
                var total = 0;
                var data = GetAllWhereAsync(item)
                    .LeftJoin<SysUserInfor>((a,b)=>a.CreateUser == b.Id).
                    Select((a,b) => new TaskDto()
                    .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id).
                    Select((a, b) => new TaskDto()
                    {
                        Id = a.Id,
                        TaskNo = a.TaskNo,
@@ -60,14 +60,16 @@
                        Type = a.Type,
                        OrderType = a.OrderType,

                        LotNo = a.LotNo,

                        CancelDate = a.CancelDate,
                        FinishDate = a.FinishDate,

                        CreateUserName =b.RealName,
                        CreateUserName = b.RealName,
                        CreateTime = a.CreateTime
                    })
                    .OrderByDescending(a => a.TaskNo)
                    .ToOffsetPage(page,limit,ref total);
                    .ToOffsetPage(page, limit, ref total);
                count = total;

                return data.OrderByDescending(m=>m.TaskNo).ToList();

 Wms/WMS.Entity/LogEntity/LogTask.cs

@@ -175,5 +175,11 @@
        /// </summary>           
        public string FinishIsPick { get; set; }

        /// <summary>
        /// Desc:批次号
        /// Default:
        /// Nullable:True
        /// </summary> 
        public string LotNo { get; set; }
    }
}

 Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs

@@ -4,6 +4,7 @@
using System.Text;
using Model.ModelDto.BllQualityDto;
using WMS.Entity.BllQualityEntity;
using WMS.Entity.DataEntity;

namespace WMS.IBLL.IBllQualityServer
{
@@ -25,6 +26,11 @@
        /// <returns></returns>
        int InsertQuality(BllQualityInspect model);

        /// <summary>
        /// 获取库存批次号集合
        /// </summary>
        /// <returns></returns>
        public List<DataStockDetail> GetLotNoList();
        #endregion
    }
}

 Wms/Wms/Controllers/BllQualityController.cs

@@ -293,5 +293,25 @@
            }
        }
        #endregion


        /// <summary>
        /// 获取库存批次号集合
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetLotNoList()
        {
            try
            {
                var bolls = _qualityServer.GetLotNoList();

                return Ok(new { code = 0, msg = "批次号集合", data = bolls });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
    }
}

 Wms/Wms/appsettings.json

@@ -17,6 +17,7 @@
    //"ConnectionString": "Server=.\\MSSQLSERVER2019;Database=WMS_JC23-2;User Id=sa;Password=admin2023@;" // SqlServer 库连接字符串
    //"ConnectionString": "Server=172.16.105.10;Database=WMS_JC23-2;User ID=sa;Password=sql2019;Integrated Security=False;"
    "ConnectionString": "Server=172.16.105.2;Database=WMS_JC23-2;User ID=sa;Password=boxline@2024;Integrated Security=False;"
    //"ConnectionString": "Server=.\\SQLSERVER;Database=WMS_JC23-2;User ID=sa;Password=admin2023@;Integrated Security=False;"
  },
  "JWTConfig": {
    "Issuer": "WYY", //Token������