增加删除入库单据时删除对应标签信息。修改托盘绑定 选择入库单 加载的入库明细下拉 数据有问题。入库单据 添加入库单 选择物料 包装名称显示错误。...

yuyou_x

2024-02-19 ca85b37c350515c99a356b6bf16023183fcc280c

增加删除入库单据时删除对应标签信息。修改托盘绑定  选择入库单 加载的入库明细下拉 数据有问题。入库单据  添加入库单  选择物料 包装名称显示错误。采购入库单  删除后 此单据的物料标签也需删除避免厂商数据沉余

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -116,7 +116,15 @@
                    </script>
                    <script type="text/html" id="table-content-list">
                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> <i class="layui-icon layui-icon-delete"></i>删除</a>
                        </script>
                    </script>
                    <script type="text/html" id="table-content-Packlist">
                        {{# 
                            function GetPack(d){ 
                                return d.PackagNo + '-' + d.PackagName;
                            }
                        }}
                        {{ GetPack(d) }}
                    </script>
                </div>
            </div>
        </div>
@@ -161,7 +169,7 @@
                        {field: 'UnitName',title: '计量单位',align: 'center',width: 70}, 
                        {field: 'Standard',title: '规格',width: 160,align: 'center'}, 
                        {field: 'LotText',title: '批次描述',align: 'center',edit: 'text',width: 160}, 
                        {field: 'PackagNo',title: '包装名称',width: 160}, 
                        {field: 'PackagNo',title: '包装名称',width: 160, templet: "#table-content-Packlist"},
                        {field: 'Price',title: '单价',align: 'center',width: 80}, 
                        {field: 'Money',title: '金额',align: 'center',width: 100}, 
                        {field: 'UDF1',title: '自定义列1',align: 'center',edit: 'text',width: 140}, 
@@ -681,12 +689,14 @@
                    }
                    arr.push(data[i]); //属性
                }
				
                $.extend(infoOptions, {
                    data: arr
                });
                infoOptions.page = {
                    curr: 1
                }
                console.log(infoOptions)
                table.render(infoOptions);
            }
            

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -136,8 +136,8 @@
                    throw new Exception("未查询到入库单明细");
                }

                var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m=>m.Qty);
                var qty = detail.Qty-labelQty;
                var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty);
                var qty = detail.Qty - labelQty;

                return qty.ToString();
            }
@@ -501,6 +501,7 @@

                }


                // 删除总单
                sqlString = $"UPDATE BllArrivalNotice SET IsDel = '1',";
                sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
@@ -510,10 +511,28 @@
                sqlString += $"UPDATE BllArrivalNoticeDetail SET IsDel = '1',";
                sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
                sqlString += $"WHERE ASNNo = '{model.ASNNo}';";

                //判断是否为采购入库单据
                // 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库
                if (model.Type == "1")
                {
                    //获取单据生成对应标签
                    var list = Db.Queryable<BllBoxInfo>().Where(a => a.IsDel == "0" && a.Status == "0" && a.BindNo == null);

                    //验证对应箱支信息是否存在
                    if (list == null)
                    {
                        return "-1:已有箱码已绑定托盘或已入库，不可删除!";
                    }

                    // 删除对应箱支信息
                    sqlString += $"UPDATE BllBoxInfo SET IsDel = '1',";
                    sqlString += $"UpdateTime = GETDATE(),UpdateUser = '{model.CreateUser}' ";
                    sqlString += $"WHERE ASNNo = '{model.ASNNo}';";
                }
                Db.Ado.BeginTran();
                int rowCount = Db.Ado.ExecuteCommand(sqlString);

                if (rowCount < 2)
                if (rowCount < 3)
                {
                    Db.RollbackTran();
                    return "-1:删除失败！";
@@ -524,6 +543,7 @@
            }
            catch (Exception ex)
            {
                Db.RollbackTran();
                throw ex;
            }
        }

 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs

@@ -1687,9 +1687,24 @@
                        string[] LotNoList = item.LotNo.Split(';');
                        foreach (var item2 in LotNoList)
                        {
                            ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto();
                            entry = item;
                            entry.LotNo = item2;
                            ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto()
                            {
                                Id = item.Id,
                                ASNNo = item.ASNNo,
                                CompleteQty = item.CompleteQty,
                                CompleteTime = item.CompleteTime,
                                CreateTime = item.CreateTime,
                                Qty = item.Qty,
                                FactQty = item.FactQty,
                                LotNo = item2,
                                Money = item.Money,
                                PackagNo = item.PackagNo,
                                PackagName = item.PackagName,
                                Status = item.Status,
                                SkuNo = item.SkuNo,
                                SkuName = item.SkuName,
                            };


                            noticeList.Add(entry);
                        }
@@ -2055,7 +2070,7 @@
                        throw new Exception("该托盘未在库外，请核查!");
                    }
                }
                

                #endregion

                #region 地码信息(储位信息)