Administrator
2024-06-23 8f997184b1698d7e28625ddd0df6ae09d496823e
编写RCS任务完成反馈接口
3个文件已修改
77 ■■■■■ 已修改文件
HTML/views/StatisticalReport/BoxInfor.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Model/ModelDto/DataDto/StockDetailDto.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllTransServer/NoticeServer.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/StatisticalReport/BoxInfor.html
@@ -190,6 +190,17 @@
                        {{#  } else if(d.BitPalletMark == '1') { }}
                            <p>是</p>
                        {{# } }}
                        <script type="text/html" id="InspectPalletStatus">
                            {{#  if(d.PalletStatus=='0'){ }}
                                <p>净桶</p>
                            {{#  } else if(d.PalletStatus == '1') { }}
                                <p>预混</p>
                            {{# } else if(d.PalletStatus == '2') { }}
                                <p>半成品</p>
                            {{# } else if(d.PalletStatus == '3') { }}
                                <p>脏桶</p>
                            {{# }  }}
                        </script>
                    </script>
                </div>
            </div>
@@ -324,6 +335,7 @@
                    {field: 'AreaName', title: '所属区域', align: 'center'},
                    {field: 'LocatNo', title: '储位地址', align: 'center'},
                    {field: 'PalletNo', title: '托盘号', align: 'center'},
                    {field: 'PalletStatus', title: '托盘状态', align: 'center', templet: '#InspectPalletStatus'},
                    {field: 'SkuNo', title: '物料编码', align: 'center'},
                    {field: 'SkuName', title: '物料名称', align: 'center'},
                    //{field: 'OwnerNo',title: '货主编码',align: 'center'},
Wms/Model/ModelDto/DataDto/StockDetailDto.cs
@@ -131,6 +131,12 @@
        public DateTime? ExpirationTime { get; set; }
        /// <summary>
        /// 托盘状态
        /// Default:0:净桶 1:预混 2:半成品 3:脏桶
        /// </summary>
        public string PalletStatus { get; set; }
        /// <summary>
        /// 状态
        /// </summary>           
        public string Status { get; set; }
Wms/WMS.BLL/BllTransServer/NoticeServer.cs
@@ -464,12 +464,69 @@
                        //修改起始储位状态
                        Db.Updateable(startLocatInfo).ExecuteCommand();
                        endLocatInfo.Status = "1";//空储位
                        endLocatInfo.Status = "1";//有物品
                        //修改目标储位状态
                        Db.Updateable(endLocatInfo).ExecuteCommand();
                        break;
                    #endregion
                    #region 任务完成
                    case "2":
                        //起始储位信息
                        var startLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.StartLocat && w.IsDel == "0");
                        if (startLocatInfo2 == null)
                        {
                            resultModel.Message = "起始储位信息不存在!";
                            return resultModel;
                        }
                        //目标储位信息
                        var endLocatInfo2 = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
                        if (endLocatInfo2 == null)
                        {
                            resultModel.Message = "目标储位信息不存在!";
                            return resultModel;
                        }
                        //库存明细
                        var sd3 = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
                        if (sd3 == null)
                        {
                            resultModel.Message = "库存信息不存在!";
                            return resultModel;
                        }
                        sd3.WareHouseNo = endLocatInfo2.WareHouseNo;//所属仓库
                        sd3.RoadwayNo = endLocatInfo2.RoadwayNo;//所属巷道
                        sd3.AreaNo = endLocatInfo2.AreaNo;//所属区域
                        sd3.LocatNo = endLocatInfo2.LocatNo;//储位地址
                        if (endLocatInfo2.AreaNo == "A01")//洁净区
                        {
                            sd3.PalletStatus = "0";
                        }
                        else if (endLocatInfo2.AreaNo == "A02")//预混区
                        {
                            sd3.PalletStatus = "1";
                        }
                        else if (endLocatInfo2.AreaNo == "A03")//半成品区
                        {
                            sd3.PalletStatus = "2";
                        }
                        else if (endLocatInfo2.AreaNo == "A04")//脏桶区
                        {
                            sd3.PalletStatus = "3";
                        }
                        //修改库存明细
                        Db.Updateable(sd3).ExecuteCommand();
                        startLocatInfo2.Status = "0";//空储位
                        //修改起始储位状态
                        Db.Updateable(startLocatInfo2).ExecuteCommand();
                        endLocatInfo2.Status = "1";//有物品
                        //修改目标储位状态
                        Db.Updateable(endLocatInfo2).ExecuteCommand();
                        break;
                    #endregion
                }
                taskInfo.Status = "2";//执行完成
                //修改任务状态