修改入库页面

zhaowc

2024-06-18 298cbe11a8d27bb7e4986df21f49a015916ffa94

修改入库页面

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -87,18 +87,18 @@
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <label class="layui-form-label">单据类型</label>
                    <!-- <div  class="layui-inline">
                        <label  class="layui-form-label">单据类型</label>
                        <div class="layui-input-inline">
                            <select name="Type" id="Type" lay-filter="Type" lay-search>
                            <select name="Type" id="Type"  lay-filter="Type" lay-search>
                                <option value=""></option>
                                <!-- JC23 -->
                                <option value="0">成品入库</option>
                                 JC23 -->
                                <!--<option value="0">成品入库</option>
                                <option value="1">采购入库</option>
                                <option value="4">车间余料退回入库</option>
                                <option value="5">其它入库</option>
                                <option value="6">代储入库</option>
                                <!-- JC24 -->
                                 JC24 -->
                                <!-- <option value="0">成品入库</option>
                                <option value="1">采购入库</option>
                                <option value="2">中间品入库</option>-->
@@ -113,10 +113,10 @@
                                <!-- JC08 -->
                                <!-- <option value="0">成品入库</option>
                                <option value="1">原料入库</option>
                                <option value="2">退货入库</option> -->
                                <option value="2">退货入库</option> 
                            </select>
                        </div>
                    </div>
                    </div> -->
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 90px;">上游系统单号</label>
                        <div class="layui-input-inline">
@@ -124,13 +124,13 @@
                                autocomplete="off" class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label">客户名称</label>
                        <div class="layui-input-inline">
                            <input type="text" id="CustomerName" name="CustomerName" placeholder="客户名称" autocomplete="off"
                            class="layui-input">
                        </div>
                    </div>
                    </div> -->
                    <div class="layui-inline">
                        <label class="layui-form-label">开始日期</label>
                        <div class="layui-input-inline">
@@ -309,11 +309,11 @@
                    </div>
                    <!-- #endregion -->

                    <script type="text/html" id="toolbarDemo">
                    <!-- <script type="text/html" id="toolbarDemo">
                        <button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
                            <i class="layui-icon">&#xe654;</i>添加
                        </button>
                    </script>
                    </script> -->
 
                    <script type="text/html" id="toolbarDemoList">
                        {{# function GetBtn2(d){ 
@@ -457,8 +457,8 @@
                        {field: 'ASNNo',title: '入库单号',align: 'center',fixed: 'left',sort: true,width: 180, "disabled": true},
                        {field: 'Status',title: '执行状态',align: 'center',templet: '#buttonTpl'},
                        {field: 'Origin',title: '来源',align: 'center',width: 80},
                        {field: 'CustomerName',title: '客户名称',align: 'center'},
                        {field: 'Type',title: '单据类型',align: 'center',templet: '#templetType'},
                        //{field: 'CustomerName',title: '客户名称',align: 'center'},
                        // {field: 'Type',title: '单据类型',align: 'center',templet: '#templetType'},
                        {field: 'OrderCode',title: '上游系统单号',align: 'center',width: 180},
                        {field: 'CompleteTime',title: '完成时间',align: 'center',templet: '#templetCompleteTime'},
                        {field: 'Demo',title: '备注',align: 'center',width: 180},
@@ -491,10 +491,10 @@
                    }
                    var param = {
                        ASNNo: $("#ASNNo").val(),
                        Type: $("#Type").val(),
                        Type: '',
                        Status: $("#Status").val(),
                        OrderCode:$("#OrderCode").val(),
                        CustomerName: $("#CustomerName").val(),
                        CustomerName: '',
                        LotNo: $("#LotNo").val(),
                        SkuNo: $("#SkuNo").val(),
                        SkuName: $("#SkuName").val(),

 HTML/views/ASNSetting/PalletBind.html

@@ -69,14 +69,14 @@
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label" style="width: 60px;">所属巷道</label>
                        <div class="layui-input-inline">
                            <select name="RoadwayNo" id="RoadwayNo" lay-search>
                                <option value=""></option>
                            </select>
                        </div>
                    </div>
                    </div> -
                    <!-- 执行状态都为入库完成不用作为查询条件 -->
                    <div class="layui-inline" style="display: none;">
                        <label class="layui-form-label" style="width: 60px;">执行状态</label>
@@ -149,7 +149,7 @@
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                        <ul class="layui-tab-title" id="tab">
                            <li class="layui-this">托盘信息</li>
                            <li>箱码信息</li>
                            <!-- <li>箱码信息</li> -->
                        </ul>

                        <div id="center"></div>
@@ -183,17 +183,17 @@
                            </div>
                        </div>
                    </div>
                    <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;"
                     <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;"
                        class="layui-btn  layuiadmin-btn-list layui-btn-sm addClass" data-type="add">
                        <i class="layui-icon">&#xe654;</i>添加
                    </button>
                    </button> 
                </div>
                <!-- <a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
                    <i class="layui-icon layui-icon-edit"></i>指定储位</a> -->
                <script type="text/html" id="PalletBindDemoList">
                    {{# function GetPalletBindBtn(d){
                            var html = ''; 
                            if((d.LocatNo == ""  || d.LocatNo == null) && (d.RoadwayNo=="" || d.RoadwayNo == null) && d.Type =="0")
                            if((d.LocatNo == ""  || d.LocatNo == null)  && d.Type =="0")&& //(d.RoadwayNo=="" || d.RoadwayNo == null)
                            {
                                html += `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
                                    <i class="layui-icon layui-icon-delete"></i>删除</a> `;
@@ -342,7 +342,7 @@
                    }}
                </script>

                <script type="text/html" id="RoadwayButton">
                <!-- <script type="text/html" id="RoadwayButton">
                    {{# 
                        switch (d.RoadwayNo) {
                            case "R01": return '01巷道';
@@ -358,7 +358,7 @@
                            default: return "";
                        }
                        
                    }}
                    }} -->
                </script>
                <!-- #endregion -->
            </div>
@@ -406,7 +406,7 @@


            bindPalletBind();
            bindBoxInfo("0");
            //bindBoxInfo("0");

            //获取仓库下拉框信息
            synData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
@@ -465,7 +465,7 @@
                { field: 'PalletNo2', title: '托盘号LV2', align: 'center' },
                { field: 'PalletNo3', title: '托盘号LV3', align: 'center' },
                { field: 'LocatNo', title: '储位地址', align: 'center', width: 90 },
                { field: 'RoadwayNo', title: '所属巷道', align: 'center', width: 90, templet: '#RoadwayButton' },
                //{ field: 'RoadwayNo', title: '所属巷道', align: 'center', width: 90, templet: '#RoadwayButton' },
                { field: 'WareHouseNo', title: '所属仓库', align: 'center', width: 90, templet: '#WareHouseButton' },
                { field: 'SkuNo', title: '物料编码', align: 'center', width: 110 },
                { field: 'SkuName', title: '物料名称', align: 'center' },
@@ -501,7 +501,7 @@
                        ASNNo: $("#ASNNo").val(),
                        PalletNo: $("#PalletNo").val(),
                        LocatNo: $("#LocatNo").val(),
                        RoadwayNo: $("#RoadwayNo").val(),
                        RoadwayNo: '',
                        WareHouseNo: $("#WareHouseNo").val(),
                        Status: $("#Status").val(),
                        SkuNo: $("#SkuNo").val(),

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -58,7 +58,7 @@
                {
                    sqlPub += $"AND tb1.Status = '{model.Status}' ";
                }
                if (!string.IsNullOrEmpty(model.Type))
                /*if (!string.IsNullOrEmpty(model.Type))
                {
                    if (model.Type == "3")
                    {
@@ -73,7 +73,7 @@
                {
                    sqlPub += " AND tb1.Type != '3'";

                }
                }*/
                if (!string.IsNullOrEmpty(model.StartTime))
                {
                    sqlPub += $"AND tb1.CreateTime >= '{model.StartTime}' ";