问题修改

bklLiudl

2024-08-17 25abd822fc249e574ba3e90d34f7446b33cd9258

问题修改

 HTML/views/ASNSetting/PalletUpShelf.html

@@ -67,12 +67,12 @@
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline" style="margin-right: 0;">
                    <div class="layui-inline" style="margin-right: 0;">
                        <label class="layui-form-label" style="width: 60px;">托盘号</label>
                        <div class="layui-input-inline" style="margin-right: 0;">
                            <div class="layui-input-inline" style="margin-right: 0;">
                                <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘号"
                                    autocomplete="off" class="layui-input">
                                <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘号" autocomplete="off"
                                    class="layui-input">
                            </div>
                        </div>
                    </div>
@@ -83,7 +83,7 @@
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline" style="margin-right: 0;">
                    <div class="layui-inline" style="margin-right: 0;">
                        <label class="layui-form-label" style="width: 60px;">物品名称</label>
                        <div class="layui-input-inline" style="margin-right: 0;">
                            <input type="text" id="SkuName" name="SkuName" placeholder="物料名称" autocomplete="off"
@@ -99,7 +99,7 @@
                            </div>
                        </div>
                    </div>
					


                    <div class="layui-inline" style="margin-right: 0;">
                        <label class="layui-form-label">状态</label>
@@ -122,12 +122,12 @@
                            lay-filter="LAY-app-contlist-search">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                        </button>
						 

                    </div>
					 

                </div>
            </div>
            <div class="layui-card-body"> 
            <div class="layui-card-body">
                <div class="position-relative">
                    <table id="Box-list" lay-filter="Box-list"></table>

@@ -137,7 +137,7 @@
                        </button>
                    </div>

					


                    <script type="text/html" id="templetStatus">
                        {{# function GetBtn1(d){
@@ -152,7 +152,7 @@
                        }}
                        {{ GetBtn1(d) }}
                    </script>
					

                    <script type="text/html" id="templetCreateTime">
                        {{# function GetBtn2(d){
                                return formatDate(d.CreateTime);
@@ -160,7 +160,7 @@
                        }}
                        {{ GetBtn2(d) }}
                    </script>
                    <script type="text/html" id="templetUpdateTime">
                    <script type="text/html" id="templetUpdateTime">
                        {{# function GetBtn3(d){
                                return formatDate(d.UpdateTime);
                            }    
@@ -194,7 +194,7 @@
    <script src="../../js/jquery-3.5.1.min.js"></script>
    <script src="../../js/jquery.cookie.js"></script>
    <script>
		

        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -204,7 +204,7 @@
                table = layui.table,
                layer = layui.layer,
                laydate = layui.laydate;
			

            // 搜索方法
            form.on('submit(LAY-app-contlist-search)', function (data) {
                bindTable();
@@ -217,21 +217,21 @@
            //自定义表头
            var TotalColsArr = [[

                { field: 'TraceNo', title: '追溯号', align: 'center',fixed: 'left', width: 180, "disabled": true },
                { field: 'TraceNo', title: '追溯号', align: 'center', fixed: 'left', width: 180, "disabled": true },
                { field: 'TaskNo', title: '任务号', align: 'center', fixed: 'left', width: 220, "disabled": true },
                { field: 'PalletNo', title: '托盘号', align: 'center', fixed: 'left', width: 220, "disabled": true  },
                { field: 'PalletNo', title: '托盘号', align: 'center', fixed: 'left', width: 220, "disabled": true },
                { field: 'Status', title: '状态', align: 'center', templet: '#templetStatus', width: 90 },
                { field: 'SkuNo', title: '物料编码', align: 'center',  width: 140},
                { field: 'SkuName', title: '物料名称', align: 'center'},
                { field: 'LotNo', title: '批次号', align: 'center', width: 155},
                { field: 'SkuNo', title: '物料编码', align: 'center', width: 140 },
                { field: 'SkuName', title: '物料名称', align: 'center' },
                { field: 'LotNo', title: '批次号', align: 'center', width: 155 },

                { field: 'LocatName', title: '储位地址', align: 'center', width: 90 },
                { field: 'LocatNo', title: '储位地址', align: 'center', width: 90 },
                { field: 'RoadwayName', title: '所属巷道', align: 'center', width: 90 },
                { field: 'WareHouseName', title: '所属仓库', align: 'center', width: 90 },

                { field: 'CreateUserName', title: '创建人', align: 'center', width: 100 },
                { field: 'CreateTime', title: '创建时间', align: 'center', width: 160, templet: '#templetCreateTime' },
                

                { field: 'UpdateUserName', title: '更新人', align: 'center', width: 100 },
                { field: 'UpdateTime', title: '更新时间', align: 'center', width: 160, templet: '#templetUpdateTime' },
                //{ field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
@@ -256,12 +256,12 @@
                        colsJson = TotalColsArr
                    }
                    var param = {
                        TraceNo:$("#ASNNo").val(),
                        TraceNo: $("#ASNNo").val(),
                        TaskNo: $("#BoxNo").val(),
                        PalletNo: $("#PalletNo").val(), 
                        PalletNo: $("#PalletNo").val(),
                        SkuNo: $("#SkuNo").val(),
                        SkuName: $("#SkuName").val(),
                        LotNo: $("#LotNo").val(), 
                        LotNo: $("#LotNo").val(),
                        Status: $("#Status").val(),
                    };
                    table.render({
@@ -271,7 +271,7 @@
                        height: 'full-96',
                        id: 'Box-list',
                        where: param,
                        contentType: 'application/json', 
                        contentType: 'application/json',
                        headers: { ToKen: $.cookie('token') },
                        page: true,
                        even: true,
@@ -279,7 +279,7 @@
                        limits: pageLimits,
                        cellMinWidth: 60, //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                        done: function (res) {
							

                            //自定义列宽
                            SetTableColW('Box-list', 'BllAsn/GetPalletUpShelfList', TotalColsSysArr);
                        },

 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs

@@ -399,10 +399,11 @@
                }
                else if (model.Type == "0")//物料托
                {
                    if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
                    {
                        throw new Exception($"托盘绑定明细中，含有箱码生产工单不一致");
                    }
                    // 使用场景不明确
                    //if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
                    //{
                    //    throw new Exception($"托盘绑定明细中，含有箱码生产工单不一致");
                    //}
                    if (model.Detail.Count(m => m.SkuNo != model.SkuNo || m.LotNo != model.LotNo) > 0)
                    {
                        throw new Exception($"托盘绑定明细中，含有箱码物料或批次不一致");

 Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs

@@ -93,23 +93,23 @@
                    outDtoList.Add(locatEntry2);

                    // 正式运行程序放开
                    var jsonData = JsonConvert.SerializeObject(outDtoList);
                    string response = "";
                    //var jsonData = JsonConvert.SerializeObject(outDtoList);
                    //string response = "";

                    try
                    {
                        response = HttpHelper.DoPost(url, jsonData, "下发给WCS同步储位信息", "WCS");
                        //解析返回数据 
                        var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                        if (wcsModel.StatusCode == -1)
                        {
                            throw new Exception(wcsModel.Msg);
                        }
                    }
                    catch (Exception ex)
                    {
                        throw new Exception(ex.Message);
                    }
                    //try
                    //{
                    //    response = HttpHelper.DoPost(url, jsonData, "下发给WCS同步储位信息", "WCS");
                    //    //解析返回数据 
                    //    var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                    //    if (wcsModel.StatusCode == -1)
                    //    {
                    //        throw new Exception(wcsModel.Msg);
                    //    }
                    //}
                    //catch (Exception ex)
                    //{
                    //    throw new Exception(ex.Message);
                    //}
                }

                Db.CommitTran();
@@ -195,23 +195,23 @@
                if (i > 0)
                {
                    // 正式运行程序放开
                    var jsonData = JsonConvert.SerializeObject(outDtoList);
                    string response = "";
                    //var jsonData = JsonConvert.SerializeObject(outDtoList);
                    //string response = "";

                    try
                    {
                        response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                        //解析返回数据 
                        var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                        if (wcsModel.StatusCode == -1)
                        {
                            throw new Exception(wcsModel.Msg);
                        }
                    }
                    catch (Exception ex)
                    {
                        throw new Exception(ex.Message);
                    }
                    //try
                    //{
                    //    response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
                    //    //解析返回数据 
                    //    var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
                    //    if (wcsModel.StatusCode == -1)
                    //    {
                    //        throw new Exception(wcsModel.Msg);
                    //    }
                    //}
                    //catch (Exception ex)
                    //{
                    //    throw new Exception(ex.Message);
                    //}
                }
                Db.CommitTran();
                return i > 0;