编写车间出库-数量

bklLiudl

昨天 ac85f1b3f6ca3b530cb75e26e77f5ac18924a2ec

编写车间出库-数量

 Pda/View/SoSetting/WorkshopOut.html

@@ -287,7 +287,7 @@
            /* 标签切换代码 */
            $('#demodiv').hide();
            $('#demodiv1').hide();
            var xianshiyemian = 0;
            var xianshiyemian = 0;       // 0：标签  1：数量

            $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //选中后颜色
            $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //默认颜色
@@ -461,7 +461,7 @@
                        BoxNo: $("#BoxCode").val(),
                        TableType: xianshiyemian,
                    }
                    //组盘
                    // 出库
                    sendData(IP + "/PdaSo/ChejianPick", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                            layer.msg(res.msg, {
@@ -484,13 +484,6 @@
                    });
                }
                else if (xianshiyemian == 1) {
                    if ($("#bar1").val() == "") {
                        layer.msg('请选择入库单', {
                            icon: 2,
                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        });
                        return;
                    }
                    if ($("#SkuNo").val() == "") {
                        layer.msg('请输入物料', {
                            icon: 2,
@@ -509,13 +502,13 @@
                        PalletNo: $("#PalletNo2").val(),
                        SkuNo: $("#SkuNo").val(),
                        LotNo: $("#LotNo2").val(),
                        SkuQty: parseFloat($("#SkuQty2").val()), //物料数量
                        AreaNo: $("#area").val(),
                        PickQty: $("#SkuQty2").val(), //物料数量parseFloat()
                        AreaNo: $("#area2").val(),
                        TableType: xianshiyemian,
                    }
                    console.log(param)
                    //组盘
                    sendData(IP + "/PdaAsn/ChejianIn", param, 'post', function (res) {
                    // 数量标签 出库函数
                    sendData(IP + "/PdaSo/ChejianPickNum", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                            layer.msg(res.msg, {
                                icon: 1,

 Wms/Model/ModelVm/PdaVm/PdaSoVm.cs

@@ -15,6 +15,20 @@
        public string PalletNo { get; set; }

        /// <summary>
        /// 物料编码
        /// </summary>
        public string SkuNo { get; set; }
        /// <summary>
        /// 车间
        /// </summary>
        public string AreaNo { get; set; }

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

        /// <summary>
        /// 新托盘码
        /// </summary>
        public string PalletNoNew { get; set; }

 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs

@@ -1596,6 +1596,142 @@
            }
        }

        // 车间Pda拣货-数量
        public async Task ChejianPickNum(PdaSoVm model, int userId) 
        {
            Db.BeginTran();
            try
            {
                #region 判断

                if (string.IsNullOrWhiteSpace(model.PalletNo))
                {
                    throw Oops.Bah("托盘码不能为空");
                }
                if (string.IsNullOrWhiteSpace(model.SkuNo))
                {
                    throw Oops.Bah("物料编码不能为空");
                }

                decimal skuNum = 0;
                if (string.IsNullOrEmpty(model.PickQty))
                {
                    throw Oops.Bah("物料数量不可为null");
                }
                else 
                {
                    skuNum = decimal.Parse(model.PickQty);
                    if (skuNum <= 0) 
                    {
                        throw Oops.Bah("物料数量应大于0！");
                    }
                }

                // 判断是否贴标物料
                var skuModel = await Db.Queryable<SysMaterials>().FirstAsync(m => m.IsDel == "0" && m.SkuNo == model.SkuNo);
                if (skuModel == null)
                {
                    throw Oops.Bah("物料不存在，请检查物料编码是否拯却！");
                }
                else 
                {
                    if (skuModel.IsPasteCode != "0") 
                    {
                        throw Oops.Bah("该物料为贴标物料，请到标签页面拣货！");
                    }
                }


                //库存明细
                var stockDetail = await Db.Queryable<DataStockDetail>()
                    .FirstAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo
                    && m.SkuNo == model.SkuNo  && m.LotNo == model.LotNo);
                if (stockDetail == null)
                {
                    throw Oops.Bah("未查询到该托盘上货物的库存明细信息！");
                }

                // 验证是否车间线边仓库
                var areaList = new List<string>() { "B06", "B07", "B09" };
                if (!areaList.Contains(stockDetail.AreaNo))
                {
                    throw Oops.Bah("托盘不是车间托盘！");
                }

                //库存总表
                var stock = await Db.Queryable<DataStock>()
                    .FirstAsync(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
                if (stock == null)
                {
                    throw Oops.Bah("未查询到该托盘上货物的库存信息！");
                }
                #endregion

                var pickQty = skuNum;

                //删除或修改库存明细
                stockDetail.BitPalletMark = "1";//修改为零托标识
                stockDetail.Qty -= pickQty;
                if (stockDetail.Qty == stockDetail.LockQty)
                {
                    stockDetail.Status = "2";
                }
                else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
                {
                    stockDetail.Status = "1";
                }
                else
                {
                    stockDetail.Status = "0";
                }

                if (stockDetail.Qty <= 0)
                {
                    await Db.Deleteable(stockDetail).ExecuteCommandAsync();
                }
                else
                {
                    await Db.Updateable(stockDetail).ExecuteCommandAsync();
                }
                stock.Qty -= pickQty;
                if (stock.Qty <= 0)
                {
                    await Db.Deleteable(stock).ExecuteCommandAsync();
                }
                else
                {
                    await Db.Updateable(stock).ExecuteCommandAsync();
                }

                var num2 = await Db.Queryable<DataStockDetail>().CountAsync(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
                if (num2 <= 0)
                {
                    //改变托盘状态
                    var pallet = await Db.Queryable<SysPallets>().FirstAsync(m => m.PalletNo == model.PalletNo && m.IsDel == "0");
                    if (pallet == null)
                    {
                        throw Oops.Bah("未在托盘表中查询到托盘信息");
                    }
                    pallet.Status = "0";
                    await Db.Updateable(pallet).ExecuteCommandAsync();
                }

                //添加操作日志记录
                var k = new OperationSOServer().AddLogOperationSo("PDA模块", "车间出库",
                    skuModel.SkuName, "拣货", $"在PDA车间出库页上对：：{skuModel.SkuName}的物料进行拣货操作", userId);
                Db.CommitTran();
            }
            catch (AppFriendlyException e)
            {
                Db.RollbackTran();
            }
            catch (Exception e)
            {
                Db.RollbackTran();
                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 根据箱码获取标签箱码信息（车间入库-获取WMS生成的箱信息）
        /// </summary>

 Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs

@@ -39,6 +39,15 @@


        Task ChejianPick(string palletNo, string boxNo, int userId);
        
        /// <summary>
        /// 车间按出库 按数量
        /// </summary>
        /// <param name="palletNo"></param>
        /// <param name="boxNo"></param>
        /// <param name="userId"></param>
        /// <returns></returns>
        Task ChejianPickNum(PdaSoVm model, int userId);

        List<BoxInfoDto> GetWmsBoxInfos(string boxNo);


 Wms/Wms/Controllers/PdaSoController.cs

@@ -326,9 +326,31 @@
        [HttpPost]
        public async Task ChejianPick(PdaSoVm model)
        {
            if (_userManager.UserId == 0)
            {
                throw new Exception("未获取到用户信息");
            }

            await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
        }

        /// <summary>
        /// 车间Pda出库-数量
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        [HttpPost]
        public async Task ChejianPickNum(PdaSoVm model) 
        {
            if (_userManager.UserId == 0)
            {
                throw new Exception("未获取到用户信息");
            }

            await _pdaSoSvc.ChejianPickNum(model, _userManager.UserId);
        }

        #endregion

        #region JC23版取样