Merge branch 'master' of http://120.77.11.229:3000/ZTGT/WEBUI

WMS.BZModels/Dto/CP/WeighingResult/WeighingResultQueryDto.cs

@@ -0,0 +1,16 @@
+using SqlSugar;
+
+namespace WMS.BZModels.Dto.CP.WeighingResult
+{
+    /// <summary>
+    /// 校称记录查询参数类
+    /// </summary>
+    public class WeighingResultQueryDto : PagerInfo
+    {
+        /// <summary>
+        /// 是否超限 0全部 1超限 2未超限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否超限")]
+        public int IsOutOfTolerance { get; set; }
+    }
+}

WMS.BZModels/Models/CP/BaseWeighingResult.cs

@@ -0,0 +1,42 @@
+using SqlSugar;
+
+namespace WMS.BZModels.Models.CP
+{
+    /// <summary>
+    /// 称重结果
+    /// </summary>
+    [Tenant("cp")]
+    [SugarTable("Base_WeighingResult")]
+    public partial class BaseWeighingResult : BaseModel
+    {
+        /// <summary>
+        /// 标准重量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "标准重量")]
+        public decimal StandardWeight { get; set; }
+
+        /// <summary>
+        /// 称重重量
+        /// </summary>
+        [SugarColumn(ColumnDescription = "称重重量")]
+        public decimal MeasuredWeight { get; set; }
+
+        /// <summary>
+        /// 偏差上限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "偏差上限")]
+        public decimal UpperDeviationLimit { get; set; }
+
+        /// <summary>
+        /// 偏差下限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "偏差下限")]
+        public decimal LowerDeviationLimit { get; set; }
+
+        /// <summary>
+        /// 是否超限
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否超限")]
+        public bool IsOutOfTolerance { get; set; }
+    }
+}

WMS.BZServices/CP/WeighingResultService.cs

@@ -0,0 +1,34 @@
+using SqlSugar;
+using WMS.BZModels;
+using WMS.BZModels.Dto.CP.WeighingResult;
+using WMS.BZModels.Models.CP;
+using WMS.BZSqlSugar;
+using WMS.Info;
+
+namespace WMS.BZServices.CP
+{
+    public class WeighingResultService
+    {
+        private readonly Repository<BaseWeighingResult> _sysconrepository;
+
+        public WeighingResultService(Repository<BaseWeighingResult> sysconrepository)
+        {
+            _sysconrepository = sysconrepository;
+        }
+
+        public PagedInfo<BaseWeighingResult> GetPageList(Pagination pagination, WeighingResultQueryDto sysconQueryDto)
+        {
+            var predicate = Expressionable.Create<BaseWeighingResult>();
+            //predicate = predicate.AndIF(!string.IsNullOrEmpty(sysconQueryDto?.KeyWord), m => m.Code.Contains(sysconQueryDto.KeyWord) || m.Name.Contains(sysconQueryDto.KeyWord) || m.SContent.Contains(sysconQueryDto.KeyWord)
+            //|| m.SType.Contains(sysconQueryDto.KeyWord));
+            predicate = predicate.AndIF(sysconQueryDto.IsOutOfTolerance == 1, m => m.IsOutOfTolerance);
+            predicate = predicate.AndIF(sysconQueryDto.IsOutOfTolerance == 2, m => !m.IsOutOfTolerance);
+            //predicate = predicate.AndIF(!string.IsNullOrEmpty(sysconQueryDto?.Name), m => m.Name.Contains(sysconQueryDto.Name));
+            //predicate = predicate.And(m => m.SType != "PalletizingType");
+            var list = _sysconrepository.Queryable().Where(predicate.ToExpression())
+                 .ToPage<BaseWeighingResult, BaseWeighingResult>(pagination);
+
+            return list;
+        }
+    }
+}

WMS.BZWeb/Areas/CPManager/Controllers/WeighingResultController.cs

@@ -0,0 +1,89 @@
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using WMS.BZModels;
+using WMS.BZModels.Dto.CP.WeighingResult;
+using WMS.BZServices.CP;
+using WMS.Info;
+using WMS.Util;
+
+namespace WMS.BZWeb.Areas.CPManager.Controllers
+{
+    [Area("CPManager")]
+    public class WeighingResultController : MvcControllerBase
+    {
+        private readonly WeighingResultService _syscon;
+
+        public WeighingResultController(WeighingResultService syscon)
+        {
+            _syscon = syscon;
+        }
+
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        public IActionResult TunnelIndex()
+        {
+            //ViewBag.HJWCSWebAPIUrl = ConfigHelper.GetConfig().HJWCSWebAPIUrl;
+            return View();
+        }
+
+        public IActionResult OutInPationIndex()
+        {
+            return View();
+        }
+
+        public ActionResult Form()
+        {
+            return View();
+        }
+
+        public IActionResult StartIndex()
+        {
+            return View();
+        }
+
+        public IActionResult StopIndex()
+        {
+            return View();
+        }
+
+        public IActionResult BoxBingIndex()
+        {
+            ViewBag.CPWMSWebAPIUrl = ConfigHelper.GetConfig().CPWMSWebAPIUrl;
+            return View();
+        }
+
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = InitPagination(pagination);
+            var query = new WeighingResultQueryDto();
+            if (!string.IsNullOrEmpty(queryJson))
+            {
+                query = JsonConvert.DeserializeObject<WeighingResultQueryDto>(queryJson);
+            }
+
+            var lists = _syscon.GetPageList(paginationobj, query ?? new WeighingResultQueryDto());
+
+            var jsonData = new
+            {
+                rows = lists.Result,
+                total = lists.TotalPage,
+                page = lists.PageIndex,
+                records = lists.TotalNum
+            };
+            return Success(jsonData);
+        }
+
+        public ActionResult GetIsOutOfTolerance(string pagination, string queryJson)
+        {
+            var jsonData = new List<EnumEntity>()
+            {
+               new EnumEntity(){ id=1,text="超限" },
+               new EnumEntity(){ id=2,text="未超限" }
+            };
+            return Success(jsonData);
+        }
+    }
+}

WMS.BZWeb/Areas/CPManager/Views/WeighingResult/Index.cshtml

@@ -0,0 +1,57 @@
+@using WMS.BZWeb;
+@{
+    ViewBag.Title = "校秤记录";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-scroll-horizontal {
+        height: 12px;
+        display: block;
+        z-index: 100;
+    }
+
+    .lr-scroll-vertical {
+        width: 12px;
+        display: block;
+        z-index: 100;
+    }
+</style>
+<div class="lr-layout">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                   @*  <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                    </div> *@
+
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-4 lr-form-item">
+                                    <div class="lr-form-item-title">是否超限</div>
+                                    <div id="IsOutOfTolerance"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i>&nbsp;<span class="lrlg">刷新</span></a>
+                    </div>
+                    @* <div class=" btn-group btn-group-sm" wms-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;<span class="lrlg">新增</span></a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;<span class="lrlg">编辑</span></a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;<span class="lrlg">删除</span></a>
+                    </div> *@
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CPManager/Views/WeighingResult/Index.js")

WMS.BZWeb/Areas/CPManager/Views/WeighingResult/Index.js

@@ -0,0 +1,80 @@
+var refreshGirdData;
+var logbegin = '';
+var logend = '';
+var StartTimeBegin = '';
+var StartTimeend = '';
+var EndTimeBegin = '';
+var EndTimeend = '';
+var selectedRow;
+var refreshGirdData; // 更新数据
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                // 调用后台查询
+                // queryJson 查询条件
+
+                queryJson["IsOutOfTolerance"] = $("#IsOutOfTolerance").lrselectGet();
+                page.search({ queryJson: JSON.stringify(queryJson) });
+            }, 250);
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ queryJson: JSON.stringify({ keyword: $('#txt_Keyword').val() }) });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+
+            $('#IsOutOfTolerance').lrselect({
+                url: top.$.rootUrl + '/CPManager/WeighingResult/GetIsOutOfTolerance',
+                maxHeight: 180,
+                allowSearch: false
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/CPManager/WeighingResult/GetPageList',
+                headData: [
+                    { label: "标准重量", name: "StandardWeight", width: 170, align: "left" },
+                    { label: "称重重量", name: "MeasuredWeight", width: 200, align: "left", sortname: "TypeCode" },
+                    //{ label: "是否超限", name: "IsOutOfTolerance", width: 90, align: "left" },
+                    {
+                        label: "是否超限", name: "IsOutOfTolerance", width: 70, align: "left", formatter: function (cellvalue) {
+                            if (cellvalue == true) {
+                                return '<span class=\"label label-danger\"  >异常</span>';
+                            } else {
+                                return '<span class=\"label  label-success\" >正常</span>';
+                            }
+                        }
+                    },
+                    { label: "偏差上限", name: "UpperDeviationLimit", width: 90, align: "left" },
+                    { label: "偏差下限", name: "LowerDeviationLimit", width: 90, align: "left" },
+                    { label: "创建时间", name: "AddTime", width: 130, align: "left" },
+                    { label: "备注", name: "Memo", width: 200, align: "left" },
+                ],
+                mainId: 'ID',
+                isPage: true,
+                reloadSelected: true,
+                sidx: 'AddTime',
+                sord: 'DESC',
+            });
+            page.search({ queryJson: JSON.stringify({ IsOutOfTolerance: 0 }) });
+        },
+        search: function (param) {
+            $('#gridtable').jfGridSet('reload', param);
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

WMS.BZWeb/Areas/KLHCManager/Controllers/TasksController.cs

@@ -3,7 +3,6 @@ using Newtonsoft.Json;
 using System.Data;
 using System.Web;
 using WMS.BZModels.Dto.KLHC.TaskDtos;
-using WMS.BZModels.Models.KLHC;
 using WMS.BZServices.KLHC;
 using WMS.Info;
 using WMS.Util;
@@ -33,14 +32,14 @@ namespace WMS.BZWeb.Areas.KLHCManager.Controllers
 
         public IActionResult Form()
         {
-            ViewBag.FJWCSWebAPIUrl = ConfigHelper.GetConfig().FJWCSWebAPIUrl;
+            ViewBag.KLHCWCSWebAPIUrl = ConfigHelper.GetConfig().FJWCSWebAPIUrl;
 
             return View();
         }
 
         public IActionResult CurrentTaskIndex()
         {
-            ViewBag.FJWCSWebAPIUrl = ConfigHelper.GetConfig().FJWCSWebAPIUrl;
+            ViewBag.KLHCWCSWebAPIUrl = ConfigHelper.GetConfig().KLHCWCSWebAPIUrl;
             return View();
         }
 

WMS.BZWeb/Areas/KLHCManager/Views/Tasks/CurrentTaskIndex.cshtml

@@ -35,18 +35,12 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                              @*   <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">仓库</div>
-                                    <div id="WarehouseId"></div>
-                                </div> *@
+                           
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">任务号</div>
                                     <input id="ID" type="text" class="form-control" placeholder="请输入任务号" />
                                 </div>
-                          @*       <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">托盘/工字轮</div>
-                                    <input id="BarCode" type="text" class="form-control" placeholder="请输入工字轮编码" />
-                                </div> *@
+                       
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">任务类型</div>
                                     <div id="Type"></div>
@@ -55,22 +49,7 @@
                                     <div class="lr-form-item-title">任务状态</div>
                                     <div id="Status"></div>
                                 </div>
-                              @*   <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">等级</div>
-                                    <input id="Grade" type="text" class="form-control" placeholder="请输入等级" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">业务类型</div>
-                                    <div id="BusType"></div>
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">巷道</div>
-                                    <input id="Tunnel" type="text" class="form-control" placeholder="请输入巷道" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">楼层</div>
-                                    <input id="Floor" type="text" class="form-control" placeholder="请输入楼层" />
-                                </div> *@
+                             
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">设备</div>
                                     <input id="Device" type="text" class="form-control" placeholder="请输入设备" />
@@ -88,38 +67,13 @@
                                     <div class="lr-form-item-title">下一个地址</div>
                                     <input id="AddrNext" type="text" class="form-control" placeholder="请输入下一个地址" />
                                 </div>
-
-                                @* <div class="col-xs-4 lr-form-item">
-                                <div class="lr-form-item-title">创建时间</div>
-                                <div id="datesearch" class="datetime"></div>
-                                </div> *@
-
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">创建时间</div>
-                                    @*  <div id="datesearch" class="datetime"></div> *@
                                     <input id="AddTimeFrom" placeholder="请输入创建时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                                     <input id="AddTimeTo" placeholder="请输入创建时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                                 </div>
 
-                               @*  <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">产品编码</div>
-                                    <input id="MaterialCode" type="text" class="form-control" placeholder="请输入产品编码" />
-                                </div>
-
-
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">WMS任务</div>
-                                    <input id="WmsTask" type="text" class="form-control" placeholder="请输入WMS任务号" />
-                                </div> *@
-
-                                @* <div class="col-xs-4 lr-form-item">
-                                <div class="lr-form-item-title">开始时间</div>
-                                <div id="StartTime" class="datetime"></div>
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                <div class="lr-form-item-title">结束时间</div>
-                                <div id="EndTime" class="datetime"></div>
-                                </div> *@
+                              
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">开始时间</div>
 
@@ -129,23 +83,11 @@
                                 </div>
                                 <div class="col-xs-4 lr-form-item">
                                     <div class="lr-form-item-title">结束时间</div>
-                                    @*    <div id="EndTime" class="datetime"></div> *@
                                     <input id="EndTimeBegin" placeholder="请输入结束时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
                                     <input id="EndTimeEnd" placeholder="请输入结束时间" readonly style="width:180px;border: 1px solid #ccc;    height: 28px;" class="datetime" type="text" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm:ss'})">
 
                                 </div>
-                                @* <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">AGV任务</div>
-                                    <input id="AgvTaskID" type="text" class="form-control" placeholder="请输入AGV任务号" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">机台号</div>
-                                    <input id="WorkBench" type="text" class="form-control" placeholder="请输入机台号" />
-                                </div>
-                                <div class="col-xs-4 lr-form-item">
-                                    <div class="lr-form-item-title">物料编码</div>
-                                    <input id="MatCode" type="text" class="form-control" placeholder="请输入物料编码" />
-                                </div> *@
+                             
                             </div>
                         </div>
                     </div>
@@ -155,8 +97,8 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i>&nbsp;<span class="lrlg">刷新</span></a>
                     </div>
                     <div class=" btn-group btn-group-sm" wms-authorize="yes">
-                        @* <a id="lr_cancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消</a>
-                        <a id="lr_done" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;完成</a>
+                        <a id="lr_cancel" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;取消</a>
+                        @* <a id="lr_done" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;完成</a>
                         <a id="lr_reagvtask" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;重下AGV任务</a>
                         <a id="lr_rergvtask" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;重下RGV任务</a>
                         <a id="lr_Priority" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;优先级</a> *@

WMS.BZWeb/WMS.BZWeb.csproj

@@ -86,6 +86,7 @@
     <None Remove="Areas\CPManager\Views\DeviceEffectives\IndexList.js" />
     <None Remove="Areas\CPManager\Views\DeviceEffectives\QIndex.css" />
     <None Remove="Areas\CPManager\Views\Inventorys\FailForm.js" />
+    <None Remove="Areas\CPManager\Views\WeighingResult\Index.js" />
     <None Remove="Areas\FJManager\Views\BillBomSet\DFMAll.js" />
     <None Remove="Areas\FJManager\Views\DeviceEffectives\IndexList.js" />
     <None Remove="Areas\FJManager\Views\DeviceEffectives\QIndex.css" />
@@ -118,6 +119,10 @@
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </Content>
     <Content Include="Areas\CPManager\Views\Inventorys\FailForm.js" />
+    <Content Include="Areas\CPManager\Views\WeighingResult\Index.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
     <Content Include="Areas\FJManager\Views\BillBomSet\DFMAll.js" />
     <Content Include="Areas\FJManager\Views\BillBomSet\Form.js" />
     <Content Include="Areas\FJManager\Views\BillBomSet\PaiKu.js">
@@ -201,6 +206,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>
     </Content>
+    <Content Update="Areas\CPManager\Views\WeighingResult\Index.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+    </Content>
     <Content Update="Areas\FJManager\Views\BillBomSet\PaiKu.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <CopyToPublishDirectory>Always</CopyToPublishDirectory>