Administrator
2024-02-01 ce47c445a686ce10e8e1de4f386aaf09b34ae8ce
修改pda组托功能
8个文件已修改
1018 ■■■■ 已修改文件
HTML/views/ASNSetting/ArrivalNotice.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/AsnSetting/pingKuEnter.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/AsnSetting/productEnter.html 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Model/ModelVm/PdaVm/PdaAsnVm.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 899 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.Entity/BllAsnEntity/BllPalletBind.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/PdaAsnController.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/ArrivalNotice.html
@@ -62,6 +62,7 @@
                                <option value="1">正在执行</option>
                                <option value="2">执行完成</option>
                                <option value="3">订单关闭</option>
                                <option value="4">上传完毕</option>
                            </select>
                        </div>
                    </div>
Pda/View/AsnSetting/pingKuEnter.html
@@ -84,6 +84,13 @@
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>                        
                        <div id="" class="layui-form-item layout-input">
                            <label class="layui-form-label" lang>地码:</label>
                            <div class="layui-input-block">
                                <input id="LocatNo" type="text" lay-verify="stock" lang langholder placeholder="请扫描地码"
                                    autocomplete="off" class="layui-input">
                            </div>
                        </div>
                    </form>
                    <div id="" style="text-align: center;">
                        <button class="btn-ok-blue" type="button" lay-submit lay-filter="formBind">确认入库</button>
@@ -387,10 +394,18 @@
                        });
                        return;
                    }
                    if (!$("#LocatNo").val()) {
                        layer.msg('请扫描地码', {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        });
                        return;
                    }
                    
                    let item = getCurBillInfo(bval)
                    var param = {
                        PalletNo:$("#PalletNo").val(),
                        LocatNo:$("#LocatNo").val(),
                        ASNNo:$("#bar").val()
                    }
                    param.Qty=Number(param.Qty)
Pda/View/AsnSetting/productEnter.html
@@ -46,7 +46,7 @@
                </ul>
            </div>
            <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
            <div id="zongDiv" class="layout-bill-info" style="height: 335px;">
                <form class="layui-form" action="">
                    <div id="" class="layui-form-item layout-dropdownlist">
                        <label class="layui-form-label" lang>入库单:</label>
@@ -92,6 +92,28 @@
                        <label class="layui-form-label" lang>尾箱条码:</label>
                        <div class="layui-input-block">
                            <input id="BOXCODE2" type="text" lang langholder placeholder="请扫描外箱条码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div id="" class="layui-form-item layout-input BOX01">
                        <label class="layui-form-label" lang>二级条码:</label>
                        <div class="layui-input-block">
                            <input id="BOXCODE01" type="text" lang langholder placeholder="请扫描二级条码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div id="" class="layui-form-item layout-input BOX01">
                        <label class="layui-form-label" lang>二级连组:</label>
                        <div class="layui-input-block">
                            <input type="checkbox" name="IsLianXu2" id="IsLianXu2" lay-skin="switch" lay-text="是|否"
                                lay-filter="IsLianXu2">
                        </div>
                    </div>
                    <div id="" class="layui-form-item layout-input BOX02" style="display: none;">
                        <label class="layui-form-label" lang>二级尾码:</label>
                        <div class="layui-input-block">
                            <input id="BOXCODE02" type="text" lang langholder placeholder="请扫描二级条码尾码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
@@ -214,8 +236,10 @@
            //当前分页
            var curPageIndex = 1;
            //是否连续组托
            //是否连续外箱组托
            isContinue = "0";
            //是否连续二级码组托
            isContinue2 = "0";
            //清楚文本框中数据
            function clear() {
                $("#ImportQuantity").val("");
@@ -562,9 +586,10 @@
            function checkBoxInfo() {
                var param = {
                    "ASNNo":$("#bar").val(),
                    "BoxNo": $("#BOXCODE").val(),
                }
                sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
                sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
                    if (res.code == 0) { //成功
                        var bl = false; console.log(res.data);
                        if (res.data.length == 0) {
@@ -605,14 +630,38 @@
            form.on('switch(IsLianXu)', function (obj) {
                if (obj.elem.checked) {
                    $('#BOX2').attr("style", "display:block")
                    $('#zongDiv').attr("style", "height: 285px;")
                    $('#zongDiv').attr("style", "height: 335px;")
                    isContinue = "1";
                    $('.BOX01').attr("style", "display:none")
                    $('.BOX02').attr("style", "display:none")
                } else {
                    $('#BOX2').attr("style", "display:none")
                    $('#zongDiv').attr("style", "height: 255px;")
                    $('#zongDiv').attr("style", "height: 315px;")
                    isContinue = "0";
                    $('.BOX01').attr("style", "display:block");
                }
                $('#BOXCODE2').val("");
                $('#BOXCODE01').val("");
                $('#BOXCODE02').val("");
                $('#IsLianXu2').attr("checked", false);
                isContinue2 = "0";
            });
            form.on('switch(IsLianXu2)', function (obj) {
                if (obj.elem.checked) {
                    $('.BOX02').attr("style", "display:block")
                    $('#zongDiv').attr("style", "height: 345px;")
                    isContinue = "1";
                } else {
                    $('.BOX02').attr("style", "display:none")
                    $('#zongDiv').attr("style", "height: 315px;")
                    isContinue2 = "0";
                }
                $('#BOXCODE02').val("");
            });
            $("#menuImg").click(function (e) {
Wms/Model/ModelVm/PdaVm/PdaAsnVm.cs
@@ -45,5 +45,20 @@
        /// </summary>           
        public string Origin { get; set; }
        /// <summary>
        /// Desc:二级码
        /// </summary>
        public string BoxNo01 { get; set; }
        /// <summary>
        /// Desc:二级码是否连续组托
        /// </summary>
        public string IsContinue2 { get; set; }
        /// <summary>
        /// Desc:二级码尾码
        /// </summary>
        public string TailBoxNo01 { get; set; }
    }
}
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -29,7 +29,7 @@
            try
            {
                // 未关单的单据
                sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and IsDel='0' order by CreateTime;";
                sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and Status != '4'  and IsDel='0' order by CreateTime;";
                var modelList = Db.Ado.SqlQuery<ArrivalNoticeDto>(sqlString);
                return modelList;
@@ -162,253 +162,6 @@
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
        // 绑定物料托盘
        public void BindPallet(PdaPalletBindVm model, int userId,string origin)
        {
            try
            {
                #region 判断
                if (string.IsNullOrEmpty(model.AsnNo))
                {
                    throw new Exception("-1:单据号不可为空!");
                }
                if (model.AsnDetailId == null || model.AsnDetailId == 0)
                {
                    throw new Exception("-1:物料不可为空!");
                }
                if (string.IsNullOrEmpty(model.PalletNo))
                {
                    throw new Exception("-1:托盘号不可为空!");
                }
                if (string.IsNullOrEmpty(model.BoxNo))
                {
                    throw new Exception("-1:箱码信息不可为空!");
                }
                if (model.IsContinue == "1")
                {
                    if (string.IsNullOrWhiteSpace(model.TailBoxNo))
                    {
                        throw new Exception("-1:开启连续组托时,尾箱码信息不可为空!");
                    }
                }
                #endregion
                Db.BeginTran();
                //托盘是否存在
                var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
                if (pallet == null)
                {
                    throw new Exception("未查询到托盘信息,请核实!");
                }
                // 验证入库单明细是否存在
                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo);
                if (detail == null)
                {
                    throw new Exception("-1:当前物料及批次与单据无关联,请核实!");
                }
                #region 包装
                var package = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0");
                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
                var pack = package.First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
                if (pack == null)
                {
                    throw new Exception("-1:获取物料包装失败,请核实!");
                }
                var pNum = 0;//托盘物品数量
                var bNum = 0;//箱码物品数量
                if (pack.L5Num.HasValue)
                {
                    pNum = (int)pack.L5Num;
                    bNum = (int)pack.L4Num;
                }
                else if (pack.L4Num.HasValue)
                {
                    pNum = (int)pack.L4Num;
                    bNum = (int)pack.L3Num;
                }
                else if (pack.L3Num.HasValue)
                {
                    pNum = (int)pack.L3Num;
                    bNum = (int)pack.L2Num;
                }
                else if (pack.L2Num.HasValue)
                {
                    pNum = (int)pack.L2Num;
                    bNum = (int)pack.L1Num;
                }
                else if (pack.L1Num.HasValue)
                {
                    pNum = (int)pack.L1Num;
                    bNum = (int)pack.L1Num;
                }
                if (pNum == 0 || bNum == 0)
                {
                    throw new Exception($"绑定失败,{detail.SkuNo}物品包装未找到!");
                }
                #region 验证是否允许立库同托盘不同物料入库或同托盘同物料不同批次入库
                var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
                if (palletBind != null)
                {
                    var box = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.BindNo == palletBind.Id && m.BitBoxMark == "0");
                    if (box != null && (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo))
                    {
                        var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
                        if (funSetting == null || funSetting.IsEnable == "OFF")
                        {
                            throw new Exception($"不允许立库同托盘不同物料入库或同托盘不同批次入库!");
                        }
                    }
                }
                #endregion
                var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
                var bindId = 0;
                if (bind == null)
                {
                    bind = new BllPalletBind
                    {
                        ASNNo = model.AsnNo,
                        ASNDetailNo = (int)model.AsnDetailId,
                        PalletNo = model.PalletNo,
                        PalletNo2 = "",
                        PalletNo3 = "",
                        Qty = 0,
                        FullQty = pNum,
                        Status = "0",
                        Type = "0",
                        LotNo = detail.LotNo,
                        LotText = detail.LotText,
                        SupplierLot = "",
                        InspectMark = "0",
                        BitPalletMark = "1",
                        IsBale = "0",
                        IsBelt = "0",
                        CreateUser = userId
                    };
                    // 插入托盘绑定表
                    bindId = Db.Insertable(bind).ExecuteReturnIdentity();
                }
                else
                {
                    if (bind.Status != "0")
                    {
                        throw new Exception("-1:当前托盘正在执行中,绑定失败,请核实!");
                    }
                    bindId = bind.Id;
                }
                #region 箱码信息
                var msgStr = $"箱号为{model.BoxNo}";
                var boxInfoList = new List<BllBoxInfo>();
                //首箱
                var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.Status == "0").ToList();
                if (boxInfo.Count == 0)
                {
                    throw new Exception("-1:箱码信息不存在!");
                }
                boxInfoList.AddRange(boxInfo);
                //是否连续组托
                if (model.IsContinue == "1")
                {
                    //尾箱
                    var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.Status == "0").ToList();
                    if (boxInfo2.Count == 0)
                    {
                        throw new Exception("-1:尾箱码信息不存在!");
                    }
                    boxInfoList.AddRange(boxInfo2);
                    var sql = $"select * from BllBoxInfo where IsDel = '0' and Status = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
                    var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
                    boxInfoList.AddRange(list);
                    msgStr += $"尾箱号为{model.TailBoxNo}";
                }
                #endregion
                #endregion
                // 更改箱支关系表
                var factQty = 0;//托盘总数量
                var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
                foreach (var g in boxGroup)
                {
                    var boxFullQty = 0;//箱内总数量
                    foreach (var box in g)
                    {
                        if (box.BindNo != null && box.BindNo != 0)
                        {
                            continue;
                        }
                        //箱内物料批次与单据明细不符合
                        if (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo)
                        {
                            throw new Exception($"-1:{box.BoxNo}箱内物料及批次与单据不一致,请核实!");
                        }
                        box.ASNNo = model.AsnNo;
                        box.ASNDetailNo = model.AsnDetailId;
                        box.BindNo = bindId;
                        box.PalletNo = model.PalletNo;
                        box.Status = "1";
                        box.CompleteTime = DateTime.Now;
                        box.UpdateTime = DateTime.Now;
                        box.UpdateUser = userId;
                        factQty += box.Qty;
                        boxFullQty += box.Qty;
                    }
                    if (boxFullQty > bNum)
                    {
                        throw new Exception($"绑定失败,{g.Key}箱码绑定数量大于该物品包装数量!");
                    }
                }
                Db.Updateable(boxInfoList).ExecuteCommand();
                // 更新托盘绑定表
                bind.Qty += factQty;
                if (bind.FullQty < bind.Qty)
                {
                    throw new Exception("托盘绑定数量已超出该物料包装数量");
                }
                if (bind.FullQty == bind.Qty)
                {
                    bind.BitPalletMark = "0";
                }
                Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
                // 更改入库单明细已组数量
                var sqlString = string.Empty;
                sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{factQty}' where id = '{model.AsnDetailId}';";
                Db.Ado.ExecuteCommand(sqlString);
                // 更改入库单及入库明细状态
                if (detail.Status == "0")
                {
                    var sqlString2 = string.Empty;
                    sqlString2 += $"update BllArrivalNotice set Status = '1',CompleteTime= getDate() where ASNNo = '{model.AsnNo}' and Status ='0';";
                    sqlString2 += $"update BllArrivalNoticeDetail set Status = '1',CompleteTime= getDate() where id = '{model.AsnDetailId}' and Status ='0';";
                    Db.Ado.ExecuteCommand(sqlString2);
                }
                // 更改托盘使用状态
                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
                //添加托盘记录表数据
                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
                Db.Ado.ExecuteCommand(sqlStr);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "产品组托", model.AsnNo, "添加", $"添加了托盘码为:{model.PalletNo}、{msgStr}的组盘信息", userId);
                Db.CommitTran();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                throw ex;
            }
        }
@@ -735,9 +488,6 @@
        // 平库完成入库操作
        public string CompleteInStock(PalletBindVm model)
        {
            //string sttr = "select * from BllArrivalNoticeDetail where id in (select ASNDetailNo from BllBoxInfo where ASNNo = 'ASN2023042400002' and PalletNo = 'T2300004' and Status = '1');";
            //var noticeDetaila = Db.Ado.SqlQuery<BllArrivalNoticeDetail>(sttr);
            string strMsg = "";
            string sqlString = string.Empty;
            try
@@ -780,6 +530,15 @@
                        }
                    }
                    iscount = 1; //回流入库
                }
                #endregion
                #region 地码信息(储位信息)
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0");
                if (storageLocat == null)
                {
                    strMsg = "-1:储位信息不存在或非空闲状态,请核查!";
                    return strMsg;
                }
                #endregion
@@ -847,17 +606,6 @@
                        return strMsg;
                    }
                }
                #endregion
                #region 任务
                //var task = Db.Queryable<LogTask>().First(t => t.IsDel == "0" && t.TaskNo == palletbind.TaskNo && t.Status == "0" || t.Status == "1");
                ////验证任务信息是否存在
                //if (task == null)
                //{
                //    strMsg = "-1:任务信息不存在,请核查!";
                //    return strMsg;
                //}
                #endregion
                #endregion
@@ -1731,5 +1479,632 @@
                throw ex;
            }
        }
        #region 产品组托
        /// <summary>
        /// 根据箱码获取标签箱码信息
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model)
        {
            try
            {
                if (string.IsNullOrEmpty(model.ASNNo))
                {
                    throw new Exception("请选择入库单据!");
                }
                if (string.IsNullOrEmpty(model.BoxNo))
                {
                    throw new Exception("箱码不能为空!");
                }
                var order = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.ASNNo);
                if (order == null)
                {
                    throw new Exception("入库单据不存在!");
                }
                string sqlString = string.Empty;
                //入库单类型,0:成品入库 1:采购入库 2:中间品入库 3:退货入库 4:车间余料退回入库 5:其它入库 6:代储入库
                if (order.Type == "0" || order.Type == "3" || order.Type == "5" || order.Type == "6")
                {
                    sqlString = "select BoxNo, SkuNo,SkuName, LotNo, SUM(Qty) as Qty from BllBoxInfo where IsDel = '0' ";
                    sqlString += $"and BoxNo = '{model.BoxNo}' and Status='0' ";
                    sqlString += $"group by BoxNo,SkuNo,SkuName,LotNo; ";
                }
                else
                {
                    sqlString = "select BoxNo, SkuNo,SkuName, LotNo, SUM(Qty) as Qty from BLLLabelBoxNo where IsDel = '0' ";
                    sqlString += $"and BoxNo = '{model.BoxNo}' and IsUse='0' ";
                    sqlString += $"group by BoxNo,SkuNo,SkuName,LotNo; ";
                }
                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
                if (models == null)
                {
                    throw new Exception("箱码信息不存在!");
                }
                return models;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
        public void BindPallet(PdaPalletBindVm model, int userId, string origin)
        {
            try
            {
                #region 判断
                if (string.IsNullOrEmpty(model.AsnNo))
                {
                    throw new Exception("-1:单据号不可为空!");
                }
                if (model.AsnDetailId == null || model.AsnDetailId == 0)
                {
                    throw new Exception("-1:物料不可为空!");
                }
                if (string.IsNullOrEmpty(model.PalletNo))
                {
                    throw new Exception("-1:托盘号不可为空!");
                }
                if (string.IsNullOrEmpty(model.BoxNo))
                {
                    throw new Exception("-1:箱码信息不可为空!");
                }
                if (model.IsContinue == "1")
                {
                    if (string.IsNullOrWhiteSpace(model.TailBoxNo))
                    {
                        throw new Exception("-1:开启连续组托时,尾箱码信息不可为空!");
                    }
                }
                #endregion
                // 验证入库单总表
                var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo);
                if (notice == null)
                {
                    throw new Exception("-1:当前物料及批次与单据无关联,请核实!");
                }
                //入库单类型,0:成品入库 1:采购入库 2:中间品入库 3:退货入库 4:车间余料退回入库 5:其它入库 6:代储入库
                if (notice.Type == "0" || notice.Type == "3" || notice.Type == "5" || notice.Type == "6")
                {
                    BindPalletForBox(model,userId,origin);
                }
                else
                {
                    BindPalletForLabelBox(model,userId);
                }
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
        // 绑定物料托盘
        private void BindPalletForBox(PdaPalletBindVm model, int userId, string origin)
        {
            try
            {
                Db.BeginTran();
                //托盘是否存在
                var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
                if (pallet == null)
                {
                    throw new Exception("未查询到托盘信息,请核实!");
                }
                // 验证入库单明细是否存在
                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo);
                if (detail == null)
                {
                    throw new Exception("-1:当前物料及批次与单据无关联,请核实!");
                }
                #region 包装
                var package = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0");
                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
                var pack = package.First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
                if (pack == null)
                {
                    throw new Exception("-1:获取物料包装失败,请核实!");
                }
                var pNum = 0;//托盘物品数量
                var bNum = 0;//箱码物品数量
                if (pack.L5Num.HasValue)
                {
                    pNum = (int)pack.L5Num;
                    bNum = (int)pack.L4Num;
                }
                else if (pack.L4Num.HasValue)
                {
                    pNum = (int)pack.L4Num;
                    bNum = (int)pack.L3Num;
                }
                else if (pack.L3Num.HasValue)
                {
                    pNum = (int)pack.L3Num;
                    bNum = (int)pack.L2Num;
                }
                else if (pack.L2Num.HasValue)
                {
                    pNum = (int)pack.L2Num;
                    bNum = (int)pack.L1Num;
                }
                else if (pack.L1Num.HasValue)
                {
                    pNum = (int)pack.L1Num;
                    bNum = (int)pack.L1Num;
                }
                if (pNum == 0 || bNum == 0)
                {
                    throw new Exception($"绑定失败,{detail.SkuNo}物品包装未找到!");
                }
                #endregion
                #region 验证是否允许立库同托盘不同物料入库或同托盘同物料不同批次入库
                var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
                if (palletBind != null)
                {
                    var box = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.BindNo == palletBind.Id && m.BitBoxMark == "0");
                    if (box != null && (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo))
                    {
                        var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
                        if (funSetting == null || funSetting.IsEnable == "OFF")
                        {
                            throw new Exception($"不允许立库同托盘不同物料入库或同托盘不同批次入库!");
                        }
                    }
                }
                #endregion
                var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
                var bindId = 0;
                if (bind == null)
                {
                    bind = new BllPalletBind
                    {
                        ASNNo = model.AsnNo,
                        ASNDetailNo = (int)model.AsnDetailId,
                        PalletNo = model.PalletNo,
                        PalletNo2 = "",
                        PalletNo3 = "",
                        Qty = 0,
                        FullQty = pNum,
                        Status = "0",
                        Type = "0",
                        LotNo = detail.LotNo,
                        LotText = detail.LotText,
                        SupplierLot = "",
                        InspectMark = "0",
                        BitPalletMark = "1",
                        IsBale = "0",
                        IsBelt = "0",
                        CreateUser = userId
                    };
                    // 插入托盘绑定表
                    bindId = Db.Insertable(bind).ExecuteReturnIdentity();
                }
                else
                {
                    if (bind.Status != "0")
                    {
                        throw new Exception("-1:当前托盘正在执行中,绑定失败,请核实!");
                    }
                    bindId = bind.Id;
                }
                #region 箱码信息
                var msgStr = $"箱号为{model.BoxNo}";
                var boxInfoList = new List<BllBoxInfo>();
                //首箱
                var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.Status == "0").ToList();
                if (boxInfo.Count == 0)
                {
                    throw new Exception("-1:箱码信息不存在!");
                }
                boxInfoList.AddRange(boxInfo);
                //是否连续组托
                if (model.IsContinue == "1")
                {
                    //尾箱
                    var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.Status == "0").ToList();
                    if (boxInfo2.Count == 0)
                    {
                        throw new Exception("-1:尾箱码信息不存在!");
                    }
                    boxInfoList.AddRange(boxInfo2);
                    var sql = $"select * from BllBoxInfo where IsDel = '0' and Status = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
                    var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
                    boxInfoList.AddRange(list);
                    msgStr += $"尾箱号为{model.TailBoxNo}";
                }
                #endregion
                // 更改箱支关系表
                var factQty = 0;//托盘总数量
                var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
                foreach (var g in boxGroup)
                {
                    var boxFullQty = 0;//箱内总数量
                    foreach (var box in g)
                    {
                        if (box.BindNo != null && box.BindNo != 0)
                        {
                            continue;
                        }
                        //箱内物料批次与单据明细不符合
                        if (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo)
                        {
                            throw new Exception($"-1:{box.BoxNo}箱内物料及批次与单据不一致,请核实!");
                        }
                        box.ASNNo = model.AsnNo;
                        box.ASNDetailNo = model.AsnDetailId;
                        box.BindNo = bindId;
                        box.PalletNo = model.PalletNo;
                        box.Status = "1";
                        box.CompleteTime = DateTime.Now;
                        box.UpdateTime = DateTime.Now;
                        box.UpdateUser = userId;
                        factQty += box.Qty;
                        boxFullQty += box.Qty;
                    }
                    if (boxFullQty > bNum)
                    {
                        throw new Exception($"绑定失败,{g.Key}箱码绑定数量大于该物品包装数量!");
                    }
                }
                Db.Updateable(boxInfoList).ExecuteCommand();
                // 更新托盘绑定表
                bind.Qty += factQty;
                if (bind.FullQty < bind.Qty)
                {
                    throw new Exception("托盘绑定数量已超出该物料包装数量");
                }
                if (bind.FullQty == bind.Qty)
                {
                    bind.BitPalletMark = "0";
                }
                Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
                // 更改入库单明细已组数量
                var sqlString = string.Empty;
                sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{factQty}' where id = '{model.AsnDetailId}';";
                Db.Ado.ExecuteCommand(sqlString);
                // 更改入库单及入库明细状态
                if (detail.Status == "0")
                {
                    var sqlString2 = string.Empty;
                    sqlString2 += $"update BllArrivalNotice set Status = '1',CompleteTime= getDate() where ASNNo = '{model.AsnNo}' and Status ='0';";
                    sqlString2 += $"update BllArrivalNoticeDetail set Status = '1',CompleteTime= getDate() where id = '{model.AsnDetailId}' and Status ='0';";
                    Db.Ado.ExecuteCommand(sqlString2);
                }
                // 更改托盘使用状态
                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
                //添加托盘记录表数据
                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
                Db.Ado.ExecuteCommand(sqlStr);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "产品组托", model.AsnNo, "添加", $"添加了托盘码为:{model.PalletNo}、{msgStr}的组盘信息", userId);
                Db.CommitTran();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                throw ex;
            }
        }
        // 绑定物料托盘
        public void BindPalletForLabelBox(PdaPalletBindVm model, int userId)
        {
            try
            {
                #region 判断
                if (string.IsNullOrEmpty(model.AsnNo))
                {
                    throw new Exception("-1:单据号不可为空!");
                }
                if (model.AsnDetailId == null || model.AsnDetailId == 0)
                {
                    throw new Exception("-1:物料不可为空!");
                }
                if (string.IsNullOrEmpty(model.PalletNo))
                {
                    throw new Exception("-1:托盘号不可为空!");
                }
                if (string.IsNullOrEmpty(model.BoxNo))
                {
                    throw new Exception("-1:箱码信息不可为空!");
                }
                if (model.IsContinue == "1")
                {
                    if (string.IsNullOrWhiteSpace(model.TailBoxNo))
                    {
                        throw new Exception("-1:开启连续组托时,尾箱码信息不可为空!");
                    }
                }
                if (model.IsContinue == "0" && model.IsContinue2 == "1")
                {
                    if (string.IsNullOrWhiteSpace(model.TailBoxNo01))
                    {
                        throw new Exception("-1:开启连续组托时,二级码尾码信息不可为空!");
                    }
                }
                #endregion
                Db.BeginTran();
                //托盘是否存在
                var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
                if (pallet == null)
                {
                    throw new Exception("未查询到托盘信息,请核实!");
                }
                // 验证入库单明细是否存在
                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo);
                if (detail == null)
                {
                    throw new Exception("-1:当前物料及批次与单据无关联,请核实!");
                }
                #region 包装
                var package = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0");
                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
                var pack = package.First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
                if (pack == null)
                {
                    throw new Exception("-1:获取物料包装失败,请核实!");
                }
                var pNum = 0;//托盘物品数量
                var bNum = 0;//箱码物品数量
                if (pack.L5Num.HasValue)
                {
                    pNum = (int)pack.L5Num;
                    bNum = (int)pack.L4Num;
                }
                else if (pack.L4Num.HasValue)
                {
                    pNum = (int)pack.L4Num;
                    bNum = (int)pack.L3Num;
                }
                else if (pack.L3Num.HasValue)
                {
                    pNum = (int)pack.L3Num;
                    bNum = (int)pack.L2Num;
                }
                else if (pack.L2Num.HasValue)
                {
                    pNum = (int)pack.L2Num;
                    bNum = (int)pack.L1Num;
                }
                else if (pack.L1Num.HasValue)
                {
                    pNum = (int)pack.L1Num;
                    bNum = (int)pack.L1Num;
                }
                if (pNum == 0 || bNum == 0)
                {
                    throw new Exception($"绑定失败,{detail.SkuNo}物品包装未找到!");
                }
                #region 验证是否允许立库同托盘不同物料入库或同托盘同物料不同批次入库
                var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
                if (palletBind != null)
                {
                    var box = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.BindNo == palletBind.Id && m.BitBoxMark == "0");
                    if (box != null && (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo))
                    {
                        var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
                        if (funSetting == null || funSetting.IsEnable == "OFF")
                        {
                            throw new Exception($"不允许立库同托盘不同物料入库或同托盘不同批次入库!");
                        }
                    }
                }
                #endregion
                var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
                var bindId = 0;
                if (bind == null)
                {
                    bind = new BllPalletBind
                    {
                        ASNNo = model.AsnNo,
                        ASNDetailNo = (int)model.AsnDetailId,
                        PalletNo = model.PalletNo,
                        PalletNo2 = "",
                        PalletNo3 = "",
                        Qty = 0,
                        FullQty = pNum,
                        Status = "0",
                        Type = "0",
                        LotNo = detail.LotNo,
                        LotText = detail.LotText,
                        SupplierLot = "",
                        InspectMark = "0",
                        BitPalletMark = "1",
                        IsBale = "0",
                        IsBelt = "0",
                        CreateUser = userId
                    };
                    // 插入托盘绑定表
                    bindId = Db.Insertable(bind).ExecuteReturnIdentity();
                }
                else
                {
                    if (bind.Status != "0")
                    {
                        throw new Exception("-1:当前托盘正在执行中,绑定失败,请核实!");
                    }
                    bindId = bind.Id;
                }
                #region 箱码信息
                var msgStr = $"箱号为{model.BoxNo}";
                var boxInfoList = new List<BllLabelBoxNo>();
                //首箱
                var boxInfo = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.IsUse == "0" && m.Level == "1").ToList();
                if (boxInfo.Count == 0)
                {
                    throw new Exception("-1:箱码信息不存在!");
                }
                //是否连续组托
                if (model.IsContinue == "1")
                {
                    boxInfoList.AddRange(boxInfo);
                    //尾箱
                    var boxInfo2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.IsUse == "0" && m.Level == "1").ToList();
                    if (boxInfo2.Count == 0)
                    {
                        throw new Exception("-1:尾箱码信息不存在!");
                    }
                    boxInfoList.AddRange(boxInfo2);
                    var sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='1'; ";
                    var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
                    boxInfoList.AddRange(list);
                    //找到相关的二级码
                    foreach (var item in boxInfoList)
                    {
                        sql = $"select * from BllLabelBoxNo  where IsDel = '0' and IsUse = '0' and ParentBoxNo='{item.BoxNo}' and Level = '2' ";
                        list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
                        boxInfoList.AddRange(list);
                    }
                    msgStr += $"尾箱号为{model.TailBoxNo}";
                }
                else
                {
                    var boxInfoList2 = new List<BllLabelBoxNo>();//所有二级码
                    decimal boxQty = 0.00m;//箱内二级码数量
                    if (!string.IsNullOrEmpty(model.BoxNo01))
                    {
                        //二级码首码
                        var box01Info = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo01 && m.IsUse == "0" && m.Level == "2" && (string.IsNullOrEmpty(m.ParentBoxNo) || m.ParentBoxNo == model.BoxNo)).ToList();
                        if (box01Info.Count == 0)
                        {
                            throw new Exception("-1:二级码首码信息不存在!");
                        }
                        boxInfoList2.AddRange(box01Info);
                        if (model.IsContinue2 == "1")
                        {
                            //二级码尾码
                            var box01Info2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo01 && m.IsUse == "0" && m.Level == "2" && (string.IsNullOrEmpty(m.ParentBoxNo) || m.ParentBoxNo == model.BoxNo)).ToList();
                            if (box01Info2.Count == 0)
                            {
                                throw new Exception("-1:二级码尾码信息不存在!");
                            }
                            boxInfoList2.AddRange(box01Info2);
                            //中间码
                            var sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='2' and (ParentBoxNo='' || ParentBoxNo='{model.BoxNo}'); ";
                            var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
                            boxInfoList2.AddRange(list);
                        }
                        foreach (var item in boxInfoList2)
                        {
                            item.ParentBoxNo = model.BoxNo;
                            boxQty += item.Qty;
                        }
                        boxInfoList.AddRange(boxInfoList2);
                        foreach (var item in boxInfo)
                        {
                            item.Qty = boxQty;
                        }
                    }
                    boxInfoList.AddRange(boxInfo);
                }
                #endregion
                #endregion
                // 更改箱支关系表
                decimal factQty = 0.00m;//托盘总数量
                var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
                foreach (var g in boxGroup)
                {
                    decimal boxFullQty = 0.00m;//箱内总数量
                    foreach (var box in g)
                    {
                        if (box.IsUse != "0")
                        {
                            continue;
                        }
                        //箱内物料批次与单据明细不符合
                        if (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo)
                        {
                            throw new Exception($"-1:{box.BoxNo}箱内物料及批次与单据不一致,请核实!");
                        }
                        box.ASNNo = model.AsnNo;
                        box.ASNDetailNo = model.AsnDetailId;
                        box.IsUse = "1";
                        box.CompleteTime = DateTime.Now;
                        box.UpdateTime = DateTime.Now;
                        box.UpdateUser = userId;
                        if (box.ParentBoxNo == "" && box.Level == "1")
                        {
                            factQty += box.Qty;
                            boxFullQty += box.Qty;
                        }
                    }
                    if (boxFullQty > bNum)
                    {
                        throw new Exception($"绑定失败,{g.Key}箱码绑定数量大于该物品包装数量!");
                    }
                }
                Db.Updateable(boxInfoList).ExecuteCommand();
                // 更新托盘绑定表
                bind.Qty += factQty;
                if (bind.FullQty < bind.Qty)
                {
                    throw new Exception("托盘绑定数量已超出该物料包装数量");
                }
                if (bind.FullQty == bind.Qty)
                {
                    bind.BitPalletMark = "0";
                }
                Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
                // 更改入库单明细已组数量
                var sqlString = string.Empty;
                sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{factQty}' where id = '{model.AsnDetailId}';";
                Db.Ado.ExecuteCommand(sqlString);
                // 更改入库单及入库明细状态
                if (detail.Status == "0")
                {
                    var sqlString2 = string.Empty;
                    sqlString2 += $"update BllArrivalNotice set Status = '1',CompleteTime= getDate() where ASNNo = '{model.AsnNo}' and Status ='0';";
                    sqlString2 += $"update BllArrivalNoticeDetail set Status = '1',CompleteTime= getDate() where id = '{model.AsnDetailId}' and Status ='0';";
                    Db.Ado.ExecuteCommand(sqlString2);
                }
                // 更改托盘使用状态
                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
                //添加托盘记录表数据
                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','组盘','0',getDate(),{userId},NULL,NULL);";
                Db.Ado.ExecuteCommand(sqlStr);
                new OperationASNServer().AddLogOperationAsn("PDA模块", "产品组托", model.AsnNo, "添加", $"添加了托盘码为:{model.PalletNo}、{msgStr}的组盘信息", userId);
                Db.CommitTran();
            }
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                throw ex;
            }
        }
        #endregion
    }
}
Wms/WMS.Entity/BllAsnEntity/BllPalletBind.cs
@@ -77,14 +77,14 @@
        /// Default:
        /// Nullable:False
        /// </summary>           
        public int Qty {get;set;}
        public decimal Qty {get;set;}
        /// <summary>
        /// Desc:整托数量
        /// Default:
        /// Nullable:True
        /// </summary>           
        public int? FullQty {get;set;}
        public decimal? FullQty {get;set;}
        /// <summary>
        /// Desc:状态
Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -53,5 +53,8 @@
        //零箱入库
        void CompleteInStockLing(PdaLingAsnVm model, int userId);
        // 根据箱码获取标签箱码信息
        List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model);
    }
}
Wms/Wms/Controllers/PdaAsnController.cs
@@ -410,5 +410,27 @@
        }
        #endregion
        #region 原料组托
        /// <summary>
        /// 根据箱码获取标签箱码信息
        /// </summary>
        /// <param name="model">BoxNo:箱号</param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult GetBindBoxInfos(BoxInfoVm model)
        {
            try
            {
                var models = _PdaAsnSvc.GetBindBoxInfos(model);
                return Ok(new { code = 0, msg = "标签箱码信息", data = models });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        #endregion
    }
}