HTML/views/StatisticalReport/BoxInfor.html

@@ -219,6 +219,19 @@
                            <p>放置期</p>
                        {{#  } }}
                    </script>
                    <script type="text/html" id="TempletStatus">
                        {{#  if(d.Status == '0') { }}
                            <p>待分配</p>
                        {{#  } else if(d.Status == '1'){ }}
                            <p>部分分配</p>
                        {{#  } else if(d.Status == '2'){ }}
                            <p>已分配</p>
                        {{#  } else if(d.Status == '3') { }}
                            <p>盘点锁定</p>
                        {{#  } else if(d.Status == '4') { }}
                            <p>移库锁定</p>
                        {{#  } }}
                    </script>
                    <script type="text/html" id="toolbarDemo">

                        <!-- <button class="layui-btn layuiadmin-btn-list layui-btn-sm  addClass" lay-event="add">
@@ -368,6 +381,7 @@
                    {field: 'LotNo', title: '批次号', align: 'center'},
                    {field: 'LotText', title: '批次描述', align: 'center'},
                    //{field: 'SupplierLot', title: '供货批次', align: 'center'},
                    {field: 'Status', title: '分配状态', align: 'center', templet: '#TempletStatus'},
                    {field: 'Qty', title: '数量', align: 'center'},
                    {field: 'LockQty', title: '锁定数量', align: 'center',},
                    {field: 'FrozenQty', title: '冻结数量', align: 'center'},

 HTML/web.config

@@ -6,6 +6,11 @@
                <add value="Login.html" />
            </files>
        </defaultDocument>
        <security>
            <requestFiltering>
                <requestLimits maxQueryString="2097151"/>
            </requestFiltering>
        </security>
        <httpRedirect enabled="true" destination="/views" childOnly="true" />
    </system.webServer>
</configuration>

 Wms/Model/InterFaceModel/HttpModel.cs

@@ -672,13 +672,13 @@
        /// 地码 X 坐标(mm)：任务完成时有值
        /// 是否必填：否
        /// </summary>
        public int cooX { get; set; }
        public double cooX { get; set; }

        /// <summary>
        /// 地码 Y 坐标(mm)：任务完成时有值
        /// 是否必填：否
        /// </summary>
        public int cooY { get; set; }
        public double cooY { get; set; }

        /// <summary>
        /// 当前位置编号

 Wms/WMS.BLL/BllTransServer/RcsServer.cs

@@ -56,12 +56,16 @@
                switch (model.Type)
                {
                    case "0"://叫净桶
                        pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "0"
                        pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "0" && w.Status == "0"
                        && (w.AreaNo.Contains("01") || w.AreaNo.Contains("11") || w.AreaNo.Contains("21") || w.AreaNo.Contains("31"))).OrderByDescending(o => o.CreateTime).First();
                        if (pallet == null)
                        {
                            throw new Exception("暂无净桶可分配");
                        }
                        }                        
                        pallet.Status = "2";//分配状态 0:待分配，1：部分分配 ， 2:已分配
                        //更新桶库存明细
                        Db.Updateable(pallet).ExecuteCommand();

                        taskMsg = "设备叫净桶任务";
                        break;
                    case "1"://叫料桶（混料）
@@ -71,14 +75,15 @@
                            throw new Exception("批次号为空！");
                        }
                        //查找库存中是否有可用的此批次的混料桶
                        pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "1" && w.LotNo == model.LotNo
                        pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "1" && w.Status == "0" && w.LotNo == model.LotNo
                        && (w.AreaNo.Contains("02") || w.AreaNo.Contains("12") || w.AreaNo.Contains("22") || w.AreaNo.Contains("32"))).OrderByDescending(o => o.CompleteTime).First();
                        if (pallet == null)
                        {
                            throw new Exception("暂无混料桶可分配");
                        }
                        pallet.LotNo = model.LotNo;
                        //更新桶库存明细维护批次号
                        pallet.Status = "2";//分配状态 0:待分配，1：部分分配 ， 2:已分配
                        pallet.LotNo = model.LotNo;//批次号
                        //更新桶库存明细
                        Db.Updateable(pallet).ExecuteCommand();

                        taskMsg = "设备叫料桶混料任务";
@@ -108,17 +113,20 @@
                        Db.Updateable(soNotice).ExecuteCommand();

                        //查找库存中是否有此批次的合格下料桶
                        pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "2" && w.LotNo == model.LotNo && w.InspectStatus=="1"
                        pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "2" && w.Status == "0" && w.LotNo == model.LotNo && w.InspectStatus=="1"
                        && (w.AreaNo.Contains("03") || w.AreaNo.Contains("13") || w.AreaNo.Contains("23") || w.AreaNo.Contains("33"))).OrderByDescending(o => o.CompleteTime).First();
                        if (pallet == null)
                        {
                            throw new Exception("暂无下料桶可分配");
                        }
                        pallet.Status = "2";//分配状态 0:待分配，1：部分分配 ， 2:已分配
                        //更新桶库存明细
                        Db.Updateable(pallet).ExecuteCommand();

                        taskMsg = "设备叫料桶下料任务";
                        break;
                    case "3"://叫脏桶
                        List<DataStockDetail> palletList = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "3"
                        List<DataStockDetail> palletList = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "3" && w.Status == "0"
                        && (w.AreaNo.Contains("03") || w.AreaNo.Contains("13") || w.AreaNo.Contains("23") || w.AreaNo.Contains("33"))).OrderByDescending(o => o.CompleteTime).ToList();
                        if (palletList.Count <= 0)
                        {
@@ -160,6 +168,9 @@
                            //}
                            #endregion

                            item.Status = "2";//分配状态 0:待分配，1：部分分配 ， 2:已分配
                            //更新桶库存明细
                            Db.Updateable(item).ExecuteCommand();
                            //起始储位地址信息
                            var startLoction2 = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == item.LocatNo);
                            if (startLoction2 == null)
@@ -183,7 +194,7 @@
                                IsCancel = 1,//是否可取消
                                IsFinish = 1,//是否可完成
                                Type = "1",//任务类型 0 入库任务 1 出库任务  2 移库任务
                                OrderType = "2",//单据类型 0 入库 1 出库 3其他
                                OrderType = "3",//单据类型 0 入库 1 出库 3其他
                                Status = "0",//任务状态0：等待执行1正在执行2执行完成
                                NoticeDetailNo = int.Parse(noticeNo),
                                Msg = taskMsg, //关键信息
@@ -257,7 +268,7 @@
                    IsCancel = 1,//是否可取消
                    IsFinish = 1,//是否可完成
                    Type = "1",//任务类型 0 入库任务 1 出库任务  2 移库任务
                    OrderType = "2",//单据类型 0 入库 1 出库 3其他
                    OrderType = "3",//单据类型 0 入库 1 出库 3其他
                    Status = "0",//任务状态0：等待执行1正在执行2执行完成
                    NoticeDetailNo = int.Parse(noticeNo),
                    Msg = taskMsg, //关键信息
@@ -418,7 +429,7 @@
                    IsCancel = 1,//是否可取消
                    IsFinish = 1,//是否可完成
                    Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                    OrderType = "2",//单据类型 0 入库 1 出库 3其他
                    OrderType = "3",//单据类型 0 入库 1 出库 3其他
                    Status = "0",//任务状态0：等待执行1正在执行2执行完成
                    NoticeDetailNo = int.Parse(noticeno),
                    Msg = taskMsg, //关键信息
@@ -729,20 +740,21 @@
                stockDetail.WareHouseNo = endLocatInfo.WareHouseNo;//所属仓库
                stockDetail.RoadwayNo = endLocatInfo.RoadwayNo;//所属巷道
                stockDetail.AreaNo = endLocatInfo.AreaNo;//所属区域
                stockDetail.LocatNo = endLocatInfo.LocatNo;//储位地址
                stockDetail.Status = "0";
                stockDetail.LocatNo = endLocatInfo.LocatNo;//储位地址               
                if (endLocatInfo.AreaNo.Contains("01") || endLocatInfo.AreaNo.Contains("11") || endLocatInfo.AreaNo.Contains("21") || endLocatInfo.AreaNo.Contains("31"))//洁净区
                {
                    stockDetail.PalletStatus = "0";
                    stockDetail.Status = "0";
                    stockDetail.Status = "0";//待分配
                }
                else if (endLocatInfo.AreaNo.Contains("02") || endLocatInfo.AreaNo.Contains("12") || endLocatInfo.AreaNo.Contains("22") || endLocatInfo.AreaNo.Contains("32"))//预混区
                {
                    stockDetail.PalletStatus = "1";
                    stockDetail.Status = "0";//待分配
                }
                else if (endLocatInfo.AreaNo.Contains("03") || endLocatInfo.AreaNo.Contains("13") || endLocatInfo.AreaNo.Contains("23") || endLocatInfo.AreaNo.Contains("33"))//半成品区
                {
                    stockDetail.PalletStatus = "2";
                    stockDetail.Status = "0";//待分配
                }
                else if (endLocatInfo.AreaNo.Contains("04") || endLocatInfo.AreaNo.Contains("14") || endLocatInfo.AreaNo.Contains("24")|| endLocatInfo.AreaNo.Contains("34"))//脏桶区
                {
@@ -750,6 +762,7 @@
                    stockDetail.LotNo = "";//批次
                    stockDetail.SkuNo = "";
                    stockDetail.SkuName = "";
                    stockDetail.Status = "0";//待分配
                    stockDetail.InspectStatus = "0";//待检验
                }
                //修改库存明细