JC24WMS.git - Gitblit

parent: 257e141d | 补丁 | 提交 | ignore whitespace

bklLiudl

2024-03-15 d9f292a9484ff1efb5d4ccc3076ff16d405459ca

Merge branch 'master' into Liudl

16个文件已修改

	HTML/views/ASNSetting/ArrivalNotice.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/ASNSetting/LabelPrint.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/ASNSetting/LabelPrintSelect.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/StatisticalReport/BoxInfor.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/StatisticalReport/InventoryStatistics.html	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/FlatLibraryLegend.html	100 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	HTML/views/WareHouseSetting/StorageLegend.html	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/DataServer/StockServer.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.BLL/SysServer/StorageLocatServer.cs	72 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/Controllers/BllAsnController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Wms/Wms/appsettings.json	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -1193,7 +1193,7 @@
                        layer.open({
                            type: 2,
                            title: '生成标签',
                            content: 'LabelPrintSelect.html?Id='+id,
                            content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,
                            maxmin: true,
                            area: ['480px', '615px'],
                            btn: ['确定','取消'],
@@ -1207,7 +1207,7 @@
                                    console.log(field);
                                    //提交 Ajax 成功后，静态更新表格中的数据
                                    //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
                                    var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
                                    
                                    layer.open({
                                        type: 2,

 HTML/views/ASNSetting/LabelPrint.html

@@ -118,6 +118,9 @@
            var productionTime = getQueryString('ProductionTime');
            var expirationTime = getQueryString('ExpirationTime');
            var storeTime = getQueryString('StoreTime');  

            var supplierLot=getQueryString('SupplierLot'); //供货批次
            $("#SupplierLot").html(supplierLot);
            
            var doing = true;
            // console.log(productionTime);
@@ -136,7 +139,8 @@
                        ArriveQty:arriveQty,  
                        ProductionTime:productionTime,
                        ExpirationTime:expirationTime,
                        StoreTime:storeTime
                        StoreTime:storeTime,
                        SupplierLot:supplierLot//供货批次
                    };
                    // console.log(param);
                    synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
@@ -182,7 +186,7 @@
                        $("#Standard").html(res.data.Standard);
                        $("#PackageStandard").html(res.data.PackageStandard);
                        $("#SkuNo").html(res.data.SkuNo);
                        $("#SupplierLot").html(res.data.SupplierLot);
                        
                        $("#ExpirationTime").html(expirationTime);
                        $("#StoreTime").html( storeTime);
                        

 HTML/views/ASNSetting/LabelPrintSelect.html

@@ -11,6 +11,12 @@
    <body>
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
           
            <div class="layui-form-item">
                <label class="layui-form-label">供货批次</label>
                <div class="layui-input-block">
                    <input type="text" name="SupplierLot" id="SupplierLot" placeholder="请输入供货批次" autocomplete="off" class="layui-input">
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">生产日期</label>
                <div class="layui-input-block">
@@ -116,6 +122,8 @@
                    });

                    var id = getQueryString('Id');
                    var SupplierLot=getQueryString('SupplierLot');//供货批次
                    $('#SupplierLot').val(SupplierLot);
                    var asnType = getQueryString('Type');
                    console.log(asnType);
                    console.log(asnType == 4);

 HTML/views/StatisticalReport/BoxInfor.html

@@ -79,7 +79,7 @@
                                <input type="text" id="BoxNo"  name="BoxNo" placeholder="箱码" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline zhijian">
                        <!-- <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">箱支状态</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
                                <select name="Status" id="Status" lay-search>
@@ -90,7 +90,7 @@
                                    <option value="3">已出库</option>
                                </select>
                            </div>
                        </div>
                        </div> -->
                        <div class="layui-inline zhijian">
                            <label class="layui-form-label" style="width: 60px;">抽检标记</label>
                            <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -397,6 +397,8 @@
                    {field: 'SkuName', title: '物料名称', align: 'center'},
                    {field: 'OwnerNo',title: '货主编码',align: 'center'},
                    {field: 'OwnerName',title: '货主名称',align: 'center'}, 
                    {field: 'SupplierNo',title: '供应商编码',align: 'center'},
                    {field: 'SupplierName',title: '供应商名称',align: 'center'}, 
                    {field: 'LotNo', title: '批次号', align: 'center'},
                    {field: 'LotText', title: '批次描述', align: 'center'},
                    {field: 'SupplierLot', title: '供货批次', align: 'center'},
@@ -687,14 +689,29 @@
                
                //监听Tab切换，以改变地址hash值
                element.on('tab(docDemoTabBrief)', function(data){
                    var SkuNo = $("#SkuNo").val();
                    var SkuName = $("#SkuName").val();
                    var LotNo = $("#LotNo").val();
                    var PalletNo = $("#PalletNo").val();

                    var BoxNo = $("#BoxNo").val();
                    var Status = $("#Status").val();
                    var InspectMark = $("#InspectMark").val();
                    var BitPalletMark = $("#BitPalletMark").val();
                    var BitBoxMark = $("#BitBoxMark").val();
                    var InspectStatus = $("#InspectStatus").val();

                    var OwnerNo = $("#OwnerNo").val();
                    var OwnerName = $("#OwnerName").val();

                    console.log(data.index);
                    yemianid = data.index
                    if(yemianid == 0){
                        console.log("总单");
                        refreshTable("","","","","","","","","","","","");
                        refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
                    }else if(yemianid == 1){
                        console.log("明细");
                        refreshTable2(quanid);
                        refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus);
                    }
                });
                var doing = true;

 HTML/views/StatisticalReport/InventoryStatistics.html

@@ -296,7 +296,7 @@

            var $ = layui.$;
            var yemianid = 0;
            refreshTable("", "");
            refreshTable("", "","","","");

            // 表单需要的变量
            var infoOptions;
@@ -368,7 +368,7 @@
            var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
            //#endregion
            //获取总量信息
            function refreshTable() {
            function refreshTable(SkuNo,SkuName,OwnerNo,OwnerName,LotNo) {
                //#region 自定义表头
                var colsJson
                var param1={
@@ -400,8 +400,14 @@
                        }, 
                        cols:colsJson
                    };

                    sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
                    var param = {
                        SkuNo:SkuNo, //物料号
                        SkuName:SkuName, //物料名称
                        OwnerNo:OwnerNo, //货主编码
                        OwnerName:OwnerName, //货主名称
                        LotNo:LotNo, //批次号
                    };
                    sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
                        console.log(res)
                        if (res.code == 0) { //成功
                            var list = res.data;
@@ -537,7 +543,7 @@
                    ]];
            var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
            //#endregion
            function refreshTable2(sku,lotNo) {
            function refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus) {
                //#region 自定义表头
                var colsJson2
                var param1={
@@ -568,8 +574,18 @@
                        },     
                        cols:colsJson2
                    };
					
                    sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + lotNo + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val()+ "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
                    var param = {
                        SkuNo:SkuNo, //物料号
                        SkuName:SkuName, //物料名称
                        OwnerNo:OwnerNo, //货主编码
                        OwnerName:OwnerName, //货主名称
                        LotNo:LotNo, //批次号
                        LocatNo:LocatNo,//储位地址
                        PalletNo:PalletNo, //托盘号
                        Status:Status,//库存状态
                        InspectStatus:InspectStatus //质检状态						
                    };
                    sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
                        if (res.code == 0) //成功
                        {
                            var list = res.data;
@@ -595,8 +611,6 @@
            
            //var url = IP + "/Statistical/GetInventoryList1";



            //接受全局变量
            let quanSkuNo = '';
            let quanLotNo='';
@@ -613,12 +627,12 @@
                var InspectStatus = $("#InspectStatus").val();
                if (yemianid == 0) {
                    console.log("总单");
                    refreshTable(SkuNo, SkuName);
                    refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
                } else if (yemianid == 1) {
                    quanSkuNo = '';
                    quanLotNo='';
                    console.log("明细");
                    refreshTable2(SkuNo,LotNo);
                    refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
                }

            });
@@ -631,20 +645,29 @@
                console.log(obj);
                quanSkuNo = obj.data.SkuNo;
                quanLotNo=obj.data.lotNo;
                refreshTable2(obj.data.SkuNo,obj.data.LotNo);
                refreshTable2(obj.data.SkuNo,"","","",obj.data.LotNo);
                yemianid = 1;
            });

            //监听Tab切换，以改变地址hash值
            element.on('tab(docDemoTabBrief)', function (data) {
                var SkuNo = $("#SkuNo").val();
                var SkuName = $("#SkuName").val();
                var LotNo = $("#LotNo").val();
                var LocatNo = $("#LocatNo").val();
                var PalletNo = $("#PalletNo").val();
                var OwnerNo = $("#OwnerNo").val();
                var OwnerName = $("#OwnerName").val();
                var Status = $("#Status").val();
                var InspectStatus = $("#InspectStatus").val();
                console.log(data.index);
                yemianid = data.index
                if (yemianid == 0) {
                    console.log("总单");
                    refreshTable(SkuNo, SkuName);
                    refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
                } else if (yemianid == 1) {
                    console.log("明细");
                    refreshTable2(quanSkuNo,quanLotNo);
                    refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
                }
            });


 HTML/views/WareHouseSetting/FlatLibraryLegend.html

@@ -160,6 +160,10 @@
                                    <!-- 储位图例 -->
                                    <table style="margin:0 auto;">
                                        <tr>
                                            <td><button class="btnShow1 five" disabled></button></td>
                                            <td>移出中</td>
                                            <td><button class="btnShow1 four" disabled></button></td>
                                            <td>移入中</td>
                                            <td><button class="btnShow1 three" disabled></button></td>
                                            <td>出库中</td>
                                            <td><button class="btnShow1 two" disabled></button></td>
@@ -488,6 +492,14 @@
                                        else if (item.Status == 3) {
                                            html1 += '<td><button value=' + item.LocatNo + '  class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html1 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html1 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html1 += '<td></td>'
@@ -522,6 +534,14 @@
                                        else if (item.Status == 3) {
                                            html2 += '<td><button value=' + item.LocatNo + '  class="btnShow three" style="width: 100%;height: 100%;"  ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html2 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html2 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html2 += '<td></td>'
@@ -555,6 +575,14 @@
                                        else if (item.Status == 3) {
                                            html3 += '<td><button value=' + item.LocatNo + '  class="btnShow three"  style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html3 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html3 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html3 += '<td></td>'
@@ -587,6 +615,14 @@
                                        else if (item.Status == 3) {
                                            html4 += '<td><button value=' + item.LocatNo + '  class="btnShow three"  style="width: 100%;height: 100%;"  ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html4 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html4 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html4 += '<td></td>'
@@ -618,6 +654,14 @@
                                        //出库中 3
                                        else if (item.Status == 3) {
                                            html5 += '<td><button value=' + item.LocatNo + '  class="btnShow three"  style="width: 100%;height: 100%;"  ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html5 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html5 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
@@ -653,6 +697,14 @@
                                        else if (item.Status == 3) {
                                            html6 += '<td><button value=' + item.LocatNo + '  class="btnShow three"  style="width: 100%;height: 100%;"  ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html6 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html6 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html6 += '<td></td>'
@@ -687,6 +739,14 @@
                                        //出库中 3
                                        else if (item.Status == 3) {
                                            html7 += '<td><button value=' + item.LocatNo + '  class="btnShow three"  style="width: 100%;height: 100%;"  ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html7 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html7 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
@@ -735,6 +795,14 @@
                                        else if (item.Status == 3) {
                                            html5 += '<td><button value=' + item.LocatNo + '  class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html5 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html5 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html5 += '<td></td>'
@@ -769,6 +837,14 @@
                                        else if (item.Status == 3) {
                                            html7 += '<td><button value=' + item.LocatNo + '  class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html7 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html7 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html7 += '<td></td>'
@@ -801,6 +877,14 @@
                                        //出库中 3
                                        else if (item.Status == 3) {
                                            html2 += '<td><button value=' + item.LocatNo + '  class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html2 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html2 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
@@ -835,6 +919,14 @@
                                        else if (item.Status == 3) {
                                            html1 += '<td><button value=' + item.LocatNo + '  class="btnShow three"  style="width: 100%;height: 100%;"  ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html1 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html1 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html1 += '<td></td>'
@@ -867,6 +959,14 @@
                                        else if (item.Status == 3) {
                                            html4 += '<td><button value=' + item.LocatNo + '  class="btnShow three"  style="width: 100%;height: 100%;"  ></button></td>'
                                        }
                                        //移入中 4
                                        else if (item.Status == 4) {
                                            html4 += '<td><button value=' + item.LocatNo + '  class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                        //移出中 5
                                        else if (item.Status == 5) {
                                            html4 += '<td><button value=' + item.LocatNo + '  class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
                                        }
                                    } else {
                                        // console.log(i, a);
                                        html4 += '<td></td>'

 HTML/views/WareHouseSetting/StorageLegend.html

@@ -152,6 +152,10 @@
                        <!-- 储位图例 -->
                        <table style="margin:0 auto;">
                            <tr>
                                <td><button class="btnShow five" disabled></button></td>
                                <td>移出中</td>
                                <td><button class="btnShow four" disabled></button></td>
                                <td>移入中</td>
                                <td><button class="btnShow three" disabled></button></td>
                                <td>出库中</td>
                                <td><button class="btnShow two" disabled></button></td>
@@ -569,13 +573,13 @@
                                    }
                                    
                                    //移入中 4
                                    // if (statu.Status == 4) {
                                    //     html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + '  class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
                                    // }
                                    if (statu.Status == 4) {
                                        html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + '  class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
                                    }
                                    //移出中 5
                                    // if (statu.Status == 5) {
                                    //     html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + '  class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
                                    // }
                                    if (statu.Status == 5) {
                                        html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + '  class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
                                    }

                                } else {
                                    // console.log(i, a);
@@ -624,7 +628,7 @@

                        var list = res.data;
                        //0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中  6: 损坏\屏蔽
                        var key = ['空储位', '有物品', '入库中', '出库中', '损坏\屏蔽'];
                        var key = ['空储位', '有物品', '入库中', '出库中','移入中','移出中', '损坏\屏蔽'];
                        var value = [0,0,0,0,0,0,0];
                        list.forEach(item => {
                            value[item.Status] = item.StatusNum;
@@ -637,8 +641,8 @@
                                '#91cc75',
                                '#ffdc60',
                                '#ee6666',
                                // '#ffff7f',
                                // '#ee23ee',
                                '#ffff7f',
                                '#ee23ee',
                                '#808080',
                            ],
                            title: {
@@ -665,8 +669,8 @@
                                        { value: value[1], name: key[1] }, //有物品
                                        { value: value[2], name: key[2] }, //入库中
                                        { value: value[3], name: key[3] }, //出库中
                                        // { value: value[4], name: key[4] },
                                        // { value: value[5], name: key[5] },
                                        { value: value[4], name: key[4] }, //移入中
                                        { value: value[5], name: key[5] }, //移出中
                                        { value: value[6], name: key[4] }, //损坏\屏蔽
                                    ],
                                // emphasis: {
@@ -698,7 +702,7 @@

                        var list = res.data;
                        //0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 6：损坏\屏蔽 
                        var key = ['空储位', '有物品', '入库中', '出库中','损坏\屏蔽'];
                        var key = ['空储位', '有物品', '入库中', '出库中','移入中','移出中','损坏\屏蔽'];
                        this.chartLine2 = echarts.init(document.getElementById("zhu"));
                        //巷道
                        var roarylist = [xianga, xiangb];
@@ -707,8 +711,8 @@
                        var status1 = [];
                        var status2 = [];
                        var status3 = [];
                        // var status4 = [];
                        // var status5 = [];
                        var status4 = [];
                        var status5 = [];
                        var status6 = [];
                        //获取
                        //总
@@ -725,12 +729,12 @@
                            if (list[i].Status == '3') {
                                status3.push(list[i].StatusNum)
                            }
                            // if (list[i].Status == '4') {
                            //     status4.push(list[i].StatusNum)
                            // }
                            // if (list[i].Status == '5') {
                            //     status5.push(list[i].StatusNum)
                            // }
                            if (list[i].Status == '4') {
                                status4.push(list[i].StatusNum)
                            }
                            if (list[i].Status == '5') {
                                status5.push(list[i].StatusNum)
                            }
                            if (list[i].Status == '6') {
                                status6.push(list[i].StatusNum)
                            }
@@ -845,26 +849,26 @@
                                    },
                                    data: status3
                                },                            
                                // {
                                //     name: '移入中',
                                //     type: 'bar',
                                //     color: '#ffff7f',
                                //     //label: labelOption,
                                //     emphasis: {
                                //         focus: 'series'
                                //     },
                                //     data: status4
                                // },
                                // {
                                //     name: '移出中',
                                //     type: 'bar',
                                //     color: '#ee23ee',
                                //     //label: labelOption,
                                //     emphasis: {
                                //         focus: 'series'
                                //     },
                                //     data: status5
                                // },
                                {
                                    name: '移入中',
                                    type: 'bar',
                                    color: '#ffff7f',
                                    //label: labelOption,
                                    emphasis: {
                                        focus: 'series'
                                    },
                                    data: status4
                                },
                                {
                                    name: '移出中',
                                    type: 'bar',
                                    color: '#ee23ee',
                                    //label: labelOption,
                                    emphasis: {
                                        focus: 'series'
                                    },
                                    data: status5
                                },
                                {
                                    name: '损坏\屏蔽',
                                    type: 'bar',

 Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs

@@ -205,6 +205,7 @@
        public string ProductionTime { get; set; }
        public string ExpirationTime { get; set; }
        public string StoreTime { get; set; }
        public string SupplierLot { get; set; }

    }


 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs

@@ -529,7 +529,7 @@
        }

        //获取标签信息(生成标签)
        public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId)
        public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime,string supplierLot, int userId)
        {
            try
            { 
@@ -765,7 +765,7 @@
                            LotNo = maxLotNoStr,
                            Standard = asnList.Standard,
                            PackageStandard = packStr,
                            SupplierLot = asnList.SupplierLot,
                            SupplierLot = supplierLot,
                            InspectMark = "0",
                            BitBoxMark = bNum > boxQty ? "1":"0",
                            InspectStatus = "",

 Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs

@@ -1553,7 +1553,7 @@
                task.CancelDate = DateTime.Now;
                Db.Updateable(task).ExecuteCommand();

                //修改储位信息
                //修改起始储位信息
                var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
                if (locat == null)
                {
@@ -1562,6 +1562,14 @@
                locat.Status = "1"; //有物品
                Db.Updateable(locat).ExecuteCommand();

                //修改目标储位信息
                var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
                if (locatEnd != null)
                {
                    locatEnd.Status = "0"; //空储位
                    Db.Updateable(locatEnd).ExecuteCommand();
                }                

                //修改库存明细
                var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
                if (stockDetail == null)

 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs

@@ -926,11 +926,23 @@
                {
                    throw new Exception("该托盘未在平库内,请检查!");
                }
                //起始储位信息
                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
                if (storageLocat == null)
                {
                    throw new Exception("储位信息不存在,请检查!");
                }
                //目标储位信息
                var storageLocatEnd = new SysStorageLocat();
                if (!string.IsNullOrEmpty(areaNo))
                {
                    storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
                    if (storageLocatEnd == null)
                    {
                        throw new Exception("目标储位信息不存在,请检查!");
                    }
                }
                
                //开启事务
                Db.BeginTran();

@@ -965,10 +977,16 @@
                stock.LockQty += (decimal)stockDetail.Qty;
                Db.Updateable(stock).ExecuteCommand();

                //修改储位地址状态
                //修改起始储位地址状态
                storageLocat.Status = "5";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 
                Db.Updateable(storageLocat).ExecuteCommand();

                //修改目标储位地址状态
                if (storageLocatEnd != null)
                {
                    storageLocatEnd.Status = "4";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 
                    Db.Updateable(storageLocatEnd).ExecuteCommand();
                }               
                //添加操作日志记录
                var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);
                //提交事务
@@ -1053,6 +1071,12 @@
                }
                string EndLocat = string.Empty;//目标位置
                EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
                //目标储位信息
                var storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
                if (storageLocatEnd == null)
                {
                    throw new Exception("目标储位信息不存在,请检查!");
                }
                //开启事务
                Db.BeginTran();

@@ -1091,6 +1115,10 @@
                storageLocat.Status = "5";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 
                Db.Updateable(storageLocat).ExecuteCommand();

                //修改目标储位地址状态
                storageLocatEnd.Status = "4";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 
                Db.Updateable(storageLocatEnd).ExecuteCommand();

                //添加操作日志记录
                var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);
                //提交事务

 Wms/WMS.BLL/DataServer/StockServer.cs

@@ -151,11 +151,7 @@
            if (!string.IsNullOrEmpty(lotNo))
            {
                str += " and detail.LotNo like @lotno";
            }
            if (!string.IsNullOrEmpty(skuNo) && string.IsNullOrEmpty(lotNo))
            {
                str += " and detail.LotNo = ''";
            }
            }            
            //判断储位地址是否为空
            if (!string.IsNullOrEmpty(locatNo))
            {

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -473,8 +473,8 @@
                int b = 0; //1：有物品 
                int c = 0; //2：入库中 
                int d = 0; //3：出库中 
                //int e = 0; //4：移入中 
                //int f = 0; //5：移出中 
                int e = 0; //4：移入中 
                int f = 0; //5：移出中 
                int g = 0; //6：损坏\屏蔽 

                foreach (var item in getLocateVms)
@@ -503,18 +503,18 @@
                        d = 1; //3：出库中 
                        continue;
                    }
                    ////4：移入中 
                    //if (item.Status == "4")
                    //{
                    //    e = 1; //4：移入中 
                    //    continue;
                    //}
                    ////5：移出中 
                    //if (item.Status == "5")
                    //{
                    //    f = 1; //5：移出中 
                    //    continue;
                    //}
                    //4：移入中 
                    if (item.Status == "4")
                    {
                        e = 1; //4：移入中 
                        continue;
                    }
                    //5：移出中 
                    if (item.Status == "5")
                    {
                        f = 1; //5：移出中 
                        continue;
                    }
                    //6：损坏\屏蔽 
                    if (item.Status == "6")
                    {
@@ -559,24 +559,24 @@
                    getLocateVm.Status = "3";
                    getLocateVms.Add(getLocateVm);
                }
                ////4：移入中 
                //if (e == 0)
                //{
                //    getLocateVm = new GetLocateVm();
                //    getLocateVm.WareHouseNo = wareHouseNo; //仓库号
                //    getLocateVm.StatusNum = "0";
                //    getLocateVm.Status = "4";
                //    getLocateVms.Add(getLocateVm);
                //}
                ////5：移出中 
                //if (f == 0)
                //{
                //    getLocateVm = new GetLocateVm();
                //    getLocateVm.WareHouseNo = wareHouseNo; //仓库号
                //    getLocateVm.StatusNum = "0";
                //    getLocateVm.Status = "5";
                //    getLocateVms.Add(getLocateVm);
                //}
                //4：移入中 
                if (e == 0)
                {
                    getLocateVm = new GetLocateVm();
                    getLocateVm.WareHouseNo = wareHouseNo; //仓库号
                    getLocateVm.StatusNum = "0";
                    getLocateVm.Status = "4";
                    getLocateVms.Add(getLocateVm);
                }
                //5：移出中 
                if (f == 0)
                {
                    getLocateVm = new GetLocateVm();
                    getLocateVm.WareHouseNo = wareHouseNo; //仓库号
                    getLocateVm.StatusNum = "0";
                    getLocateVm.Status = "5";
                    getLocateVms.Add(getLocateVm);
                }
                //6：损坏\屏蔽 
                if (g == 0)
                {
@@ -672,7 +672,7 @@
                    throw new Exception("未找到对应储位");
                }
                //有物品、出库中数据源（库存明细表）
                if (storageLocat.Status == "1" || storageLocat.Status == "3")
                if (storageLocat.Status == "1" || storageLocat.Status == "3" || storageLocat.Status == "5")
                {
                    //库存明细
                    List<DataStockDetail> stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.LocatNo == locatNo && w.IsDel == "0").ToList();
@@ -750,6 +750,12 @@
                    case "3":
                        model.Status = "出库中";
                        break;
                    case "4":
                        model.Status = "移入中";
                        break;
                    case "5":
                        model.Status = "移出中";
                        break;
                    default:
                        model.Status = "";
                        break;

 Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs

@@ -55,7 +55,7 @@
        /// <param name="storeTime">储存期至</param>
        /// <param name="userId">操作人</param>
        /// <returns></returns>
        List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId);
        List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, string supplierLot, int userId);

        /// <summary>
        /// 补打标签

 Wms/Wms/Controllers/BllAsnController.cs

@@ -911,7 +911,7 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty),  model.ProductionTime, model.ExpirationTime, model.StoreTime, int.Parse(userId));
                var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty), model.ProductionTime, model.ExpirationTime, model.StoreTime, model.SupplierLot, int.Parse(userId));
                return Ok(new { code = 0,  msg = "生成箱码标签成功", data = list });
            }
            catch (Exception e)

 Wms/Wms/appsettings.json

@@ -10,8 +10,9 @@
  "AppSettings": {
    //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;",
    //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
    "ConnectionString": "Server=127.0.0.1;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
    //"ConnectionString": "Server=127.0.0.1;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
    "ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
  },

			@@ -1193,7 +1193,7 @@
			layer.open({
			type: 2,
			title: '生成标签',
			content: 'LabelPrintSelect.html?Id='+id,
			content: 'LabelPrintSelect.html?Id='+id+'&SupplierLot='+data.SupplierLot,
			maxmin: true,
			area: ['480px', '615px'],
			btn: ['确定','取消'],
			@@ -1207,7 +1207,7 @@
			console.log(field);
			//提交 Ajax 成功后，静态更新表格中的数据
			//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
			var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
			var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;

			layer.open({
			type: 2,

			@@ -118,6 +118,9 @@
			var productionTime = getQueryString('ProductionTime');
			var expirationTime = getQueryString('ExpirationTime');
			var storeTime = getQueryString('StoreTime');

			var supplierLot=getQueryString('SupplierLot'); //供货批次
			$("#SupplierLot").html(supplierLot);

			var doing = true;
			// console.log(productionTime);
			@@ -136,7 +139,8 @@
			ArriveQty:arriveQty,
			ProductionTime:productionTime,
			ExpirationTime:expirationTime,
			StoreTime:storeTime
			StoreTime:storeTime,
			SupplierLot:supplierLot//供货批次
			};
			// console.log(param);
			synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
			@@ -182,7 +186,7 @@
			$("#Standard").html(res.data.Standard);
			$("#PackageStandard").html(res.data.PackageStandard);
			$("#SkuNo").html(res.data.SkuNo);
			$("#SupplierLot").html(res.data.SupplierLot);

			$("#ExpirationTime").html(expirationTime);
			$("#StoreTime").html( storeTime);

			@@ -11,6 +11,12 @@
			<body>
			<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">

			<div class="layui-form-item">
			<label class="layui-form-label">供货批次</label>
			<div class="layui-input-block">
			<input type="text" name="SupplierLot" id="SupplierLot" placeholder="请输入供货批次" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-form-item">
			<label class="layui-form-label">生产日期</label>
			<div class="layui-input-block">
			@@ -116,6 +122,8 @@
			});

			var id = getQueryString('Id');
			var SupplierLot=getQueryString('SupplierLot');//供货批次
			$('#SupplierLot').val(SupplierLot);
			var asnType = getQueryString('Type');
			console.log(asnType);
			console.log(asnType == 4);

			@@ -79,7 +79,7 @@
			<input type="text" id="BoxNo" name="BoxNo" placeholder="箱码" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-inline zhijian">
			<!-- <div class="layui-inline zhijian">
			<label class="layui-form-label" style="width: 60px;">箱支状态</label>
			<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
			<select name="Status" id="Status" lay-search>
			@@ -90,7 +90,7 @@
			<option value="3">已出库</option>
			</select>
			</div>
			</div>
			</div> -->
			<div class="layui-inline zhijian">
			<label class="layui-form-label" style="width: 60px;">抽检标记</label>
			<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
			@@ -397,6 +397,8 @@
			{field: 'SkuName', title: '物料名称', align: 'center'},
			{field: 'OwnerNo',title: '货主编码',align: 'center'},
			{field: 'OwnerName',title: '货主名称',align: 'center'},
			{field: 'SupplierNo',title: '供应商编码',align: 'center'},
			{field: 'SupplierName',title: '供应商名称',align: 'center'},
			{field: 'LotNo', title: '批次号', align: 'center'},
			{field: 'LotText', title: '批次描述', align: 'center'},
			{field: 'SupplierLot', title: '供货批次', align: 'center'},
			@@ -687,14 +689,29 @@

			//监听Tab切换，以改变地址hash值
			element.on('tab(docDemoTabBrief)', function(data){
			var SkuNo = $("#SkuNo").val();
			var SkuName = $("#SkuName").val();
			var LotNo = $("#LotNo").val();
			var PalletNo = $("#PalletNo").val();

			var BoxNo = $("#BoxNo").val();
			var Status = $("#Status").val();
			var InspectMark = $("#InspectMark").val();
			var BitPalletMark = $("#BitPalletMark").val();
			var BitBoxMark = $("#BitBoxMark").val();
			var InspectStatus = $("#InspectStatus").val();

			var OwnerNo = $("#OwnerNo").val();
			var OwnerName = $("#OwnerName").val();

			console.log(data.index);
			yemianid = data.index
			if(yemianid == 0){
			console.log("总单");
			refreshTable("","","","","","","","","","","","");
			refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName);
			}else if(yemianid == 1){
			console.log("明细");
			refreshTable2(quanid);
			refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus);
			}
			});
			var doing = true;

			@@ -296,7 +296,7 @@

			var $ = layui.$;
			var yemianid = 0;
			refreshTable("", "");
			refreshTable("", "","","","");

			// 表单需要的变量
			var infoOptions;
			@@ -368,7 +368,7 @@
			var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
			//#endregion
			//获取总量信息
			function refreshTable() {
			function refreshTable(SkuNo,SkuName,OwnerNo,OwnerName,LotNo) {
			//#region 自定义表头
			var colsJson
			var param1={
			@@ -400,8 +400,14 @@
			},
			cols:colsJson
			};

			sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
			var param = {
			SkuNo:SkuNo, //物料号
			SkuName:SkuName, //物料名称
			OwnerNo:OwnerNo, //货主编码
			OwnerName:OwnerName, //货主名称
			LotNo:LotNo, //批次号
			};
			sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
			console.log(res)
			if (res.code == 0) { //成功
			var list = res.data;
			@@ -537,7 +543,7 @@
			]];
			var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
			//#endregion
			function refreshTable2(sku,lotNo) {
			function refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus) {
			//#region 自定义表头
			var colsJson2
			var param1={
			@@ -568,8 +574,18 @@
			},
			cols:colsJson2
			};

			sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + lotNo + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val()+ "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
			var param = {
			SkuNo:SkuNo, //物料号
			SkuName:SkuName, //物料名称
			OwnerNo:OwnerNo, //货主编码
			OwnerName:OwnerName, //货主名称
			LotNo:LotNo, //批次号
			LocatNo:LocatNo,//储位地址
			PalletNo:PalletNo, //托盘号
			Status:Status,//库存状态
			InspectStatus:InspectStatus //质检状态
			};
			sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
			if (res.code == 0) //成功
			{
			var list = res.data;
			@@ -595,8 +611,6 @@

			//var url = IP + "/Statistical/GetInventoryList1";



			//接受全局变量
			let quanSkuNo = '';
			let quanLotNo='';
			@@ -613,12 +627,12 @@
			var InspectStatus = $("#InspectStatus").val();
			if (yemianid == 0) {
			console.log("总单");
			refreshTable(SkuNo, SkuName);
			refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
			} else if (yemianid == 1) {
			quanSkuNo = '';
			quanLotNo='';
			console.log("明细");
			refreshTable2(SkuNo,LotNo);
			refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
			}

			});
			@@ -631,20 +645,29 @@
			console.log(obj);
			quanSkuNo = obj.data.SkuNo;
			quanLotNo=obj.data.lotNo;
			refreshTable2(obj.data.SkuNo,obj.data.LotNo);
			refreshTable2(obj.data.SkuNo,"","","",obj.data.LotNo);
			yemianid = 1;
			});

			//监听Tab切换，以改变地址hash值
			element.on('tab(docDemoTabBrief)', function (data) {
			var SkuNo = $("#SkuNo").val();
			var SkuName = $("#SkuName").val();
			var LotNo = $("#LotNo").val();
			var LocatNo = $("#LocatNo").val();
			var PalletNo = $("#PalletNo").val();
			var OwnerNo = $("#OwnerNo").val();
			var OwnerName = $("#OwnerName").val();
			var Status = $("#Status").val();
			var InspectStatus = $("#InspectStatus").val();
			console.log(data.index);
			yemianid = data.index
			if (yemianid == 0) {
			console.log("总单");
			refreshTable(SkuNo, SkuName);
			refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
			} else if (yemianid == 1) {
			console.log("明细");
			refreshTable2(quanSkuNo,quanLotNo);
			refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
			}
			});

			@@ -160,6 +160,10 @@
			<!-- 储位图例 -->
			<table style="margin:0 auto;">
			<tr>
			<td><button class="btnShow1 five" disabled></button></td>
			<td>移出中</td>
			<td><button class="btnShow1 four" disabled></button></td>
			<td>移入中</td>
			<td><button class="btnShow1 three" disabled></button></td>
			<td>出库中</td>
			<td><button class="btnShow1 two" disabled></button></td>
			@@ -488,6 +492,14 @@
			else if (item.Status == 3) {
			html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html1 += '<td></td>'
			@@ -522,6 +534,14 @@
			else if (item.Status == 3) {
			html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html2 += '<td></td>'
			@@ -555,6 +575,14 @@
			else if (item.Status == 3) {
			html3 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html3 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html3 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html3 += '<td></td>'
			@@ -587,6 +615,14 @@
			else if (item.Status == 3) {
			html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html4 += '<td></td>'
			@@ -618,6 +654,14 @@
			//出库中 3
			else if (item.Status == 3) {
			html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			@@ -653,6 +697,14 @@
			else if (item.Status == 3) {
			html6 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html6 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html6 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html6 += '<td></td>'
			@@ -687,6 +739,14 @@
			//出库中 3
			else if (item.Status == 3) {
			html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			@@ -735,6 +795,14 @@
			else if (item.Status == 3) {
			html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html5 += '<td></td>'
			@@ -769,6 +837,14 @@
			else if (item.Status == 3) {
			html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html7 += '<td></td>'
			@@ -801,6 +877,14 @@
			//出库中 3
			else if (item.Status == 3) {
			html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			@@ -835,6 +919,14 @@
			else if (item.Status == 3) {
			html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html1 += '<td></td>'
			@@ -867,6 +959,14 @@
			else if (item.Status == 3) {
			html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移入中 4
			else if (item.Status == 4) {
			html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
			}
			//移出中 5
			else if (item.Status == 5) {
			html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
			}
			} else {
			// console.log(i, a);
			html4 += '<td></td>'

			@@ -152,6 +152,10 @@
			<!-- 储位图例 -->
			<table style="margin:0 auto;">
			<tr>
			<td><button class="btnShow five" disabled></button></td>
			<td>移出中</td>
			<td><button class="btnShow four" disabled></button></td>
			<td>移入中</td>
			<td><button class="btnShow three" disabled></button></td>
			<td>出库中</td>
			<td><button class="btnShow two" disabled></button></td>
			@@ -569,13 +573,13 @@
			}

			//移入中 4
			// if (statu.Status == 4) {
			// html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
			// }
			if (statu.Status == 4) {
			html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
			}
			//移出中 5
			// if (statu.Status == 5) {
			// html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
			// }
			if (statu.Status == 5) {
			html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
			}

			} else {
			// console.log(i, a);
			@@ -624,7 +628,7 @@

			var list = res.data;
			//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 6: 损坏\屏蔽
			var key = ['空储位', '有物品', '入库中', '出库中', '损坏\屏蔽'];
			var key = ['空储位', '有物品', '入库中', '出库中','移入中','移出中', '损坏\屏蔽'];
			var value = [0,0,0,0,0,0,0];
			list.forEach(item => {
			value[item.Status] = item.StatusNum;
			@@ -637,8 +641,8 @@
			'#91cc75',
			'#ffdc60',
			'#ee6666',
			// '#ffff7f',
			// '#ee23ee',
			'#ffff7f',
			'#ee23ee',
			'#808080',
			],
			title: {
			@@ -665,8 +669,8 @@
			{ value: value[1], name: key[1] }, //有物品
			{ value: value[2], name: key[2] }, //入库中
			{ value: value[3], name: key[3] }, //出库中
			// { value: value[4], name: key[4] },
			// { value: value[5], name: key[5] },
			{ value: value[4], name: key[4] }, //移入中
			{ value: value[5], name: key[5] }, //移出中
			{ value: value[6], name: key[4] }, //损坏\屏蔽
			],
			// emphasis: {
			@@ -698,7 +702,7 @@

			var list = res.data;
			//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中 6：损坏\屏蔽
			var key = ['空储位', '有物品', '入库中', '出库中','损坏\屏蔽'];
			var key = ['空储位', '有物品', '入库中', '出库中','移入中','移出中','损坏\屏蔽'];
			this.chartLine2 = echarts.init(document.getElementById("zhu"));
			//巷道
			var roarylist = [xianga, xiangb];
			@@ -707,8 +711,8 @@
			var status1 = [];
			var status2 = [];
			var status3 = [];
			// var status4 = [];
			// var status5 = [];
			var status4 = [];
			var status5 = [];
			var status6 = [];
			//获取
			//总
			@@ -725,12 +729,12 @@
			if (list[i].Status == '3') {
			status3.push(list[i].StatusNum)
			}
			// if (list[i].Status == '4') {
			// status4.push(list[i].StatusNum)
			// }
			// if (list[i].Status == '5') {
			// status5.push(list[i].StatusNum)
			// }
			if (list[i].Status == '4') {
			status4.push(list[i].StatusNum)
			}
			if (list[i].Status == '5') {
			status5.push(list[i].StatusNum)
			}
			if (list[i].Status == '6') {
			status6.push(list[i].StatusNum)
			}
			@@ -845,26 +849,26 @@
			},
			data: status3
			},
			// {
			// name: '移入中',
			// type: 'bar',
			// color: '#ffff7f',
			// //label: labelOption,
			// emphasis: {
			// focus: 'series'
			// },
			// data: status4
			// },
			// {
			// name: '移出中',
			// type: 'bar',
			// color: '#ee23ee',
			// //label: labelOption,
			// emphasis: {
			// focus: 'series'
			// },
			// data: status5
			// },
			{
			name: '移入中',
			type: 'bar',
			color: '#ffff7f',
			//label: labelOption,
			emphasis: {
			focus: 'series'
			},
			data: status4
			},
			{
			name: '移出中',
			type: 'bar',
			color: '#ee23ee',
			//label: labelOption,
			emphasis: {
			focus: 'series'
			},
			data: status5
			},
			{
			name: '损坏\屏蔽',
			type: 'bar',

			@@ -205,6 +205,7 @@
			public string ProductionTime { get; set; }
			public string ExpirationTime { get; set; }
			public string StoreTime { get; set; }
			public string SupplierLot { get; set; }

			}

			@@ -529,7 +529,7 @@
			}

			//获取标签信息(生成标签)
			public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId)
			public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime,string supplierLot, int userId)
			{
			try
			{
			@@ -765,7 +765,7 @@
			LotNo = maxLotNoStr,
			Standard = asnList.Standard,
			PackageStandard = packStr,
			SupplierLot = asnList.SupplierLot,
			SupplierLot = supplierLot,
			InspectMark = "0",
			BitBoxMark = bNum > boxQty ? "1":"0",
			InspectStatus = "",

			@@ -1553,7 +1553,7 @@
			task.CancelDate = DateTime.Now;
			Db.Updateable(task).ExecuteCommand();

			//修改储位信息
			//修改起始储位信息
			var locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.StartLocat);
			if (locat == null)
			{
			@@ -1562,6 +1562,14 @@
			locat.Status = "1"; //有物品
			Db.Updateable(locat).ExecuteCommand();

			//修改目标储位信息
			var locatEnd = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == "W02" && a.LocatNo == task.EndLocat);
			if (locatEnd != null)
			{
			locatEnd.Status = "0"; //空储位
			Db.Updateable(locatEnd).ExecuteCommand();
			}

			//修改库存明细
			var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == task.PalletNo);
			if (stockDetail == null)

			@@ -926,11 +926,23 @@
			{
			throw new Exception("该托盘未在平库内,请检查!");
			}
			//起始储位信息
			var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
			if (storageLocat == null)
			{
			throw new Exception("储位信息不存在,请检查!");
			}
			//目标储位信息
			var storageLocatEnd = new SysStorageLocat();
			if (!string.IsNullOrEmpty(areaNo))
			{
			storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
			if (storageLocatEnd == null)
			{
			throw new Exception("目标储位信息不存在,请检查!");
			}
			}

			//开启事务
			Db.BeginTran();

			@@ -965,10 +977,16 @@
			stock.LockQty += (decimal)stockDetail.Qty;
			Db.Updateable(stock).ExecuteCommand();

			//修改储位地址状态
			//修改起始储位地址状态
			storageLocat.Status = "5";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			Db.Updateable(storageLocat).ExecuteCommand();

			//修改目标储位地址状态
			if (storageLocatEnd != null)
			{
			storageLocatEnd.Status = "4";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			Db.Updateable(storageLocatEnd).ExecuteCommand();
			}
			//添加操作日志记录
			var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);
			//提交事务
			@@ -1053,6 +1071,12 @@
			}
			string EndLocat = string.Empty;//目标位置
			EndLocat= GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo,palletNo);
			//目标储位信息
			var storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
			if (storageLocatEnd == null)
			{
			throw new Exception("目标储位信息不存在,请检查!");
			}
			//开启事务
			Db.BeginTran();

			@@ -1091,6 +1115,10 @@
			storageLocat.Status = "5";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			Db.Updateable(storageLocat).ExecuteCommand();

			//修改目标储位地址状态
			storageLocatEnd.Status = "4";//0：空储位 1：有物品 2：入库中 3：出库中 4：移入中 5：移出中
			Db.Updateable(storageLocatEnd).ExecuteCommand();

			//添加操作日志记录
			var k = new OperationCrServer().AddLogOperationCr("PDA模块", "AGV转运", palletNo, "移库", $"PDA呼叫小车对托盘号：{palletNo}发起转运", userId);
			//提交事务

			@@ -151,11 +151,7 @@
			if (!string.IsNullOrEmpty(lotNo))
			{
			str += " and detail.LotNo like @lotno";
			}
			if (!string.IsNullOrEmpty(skuNo) && string.IsNullOrEmpty(lotNo))
			{
			str += " and detail.LotNo = ''";
			}
			}
			//判断储位地址是否为空
			if (!string.IsNullOrEmpty(locatNo))
			{

			@@ -473,8 +473,8 @@
			int b = 0; //1：有物品
			int c = 0; //2：入库中
			int d = 0; //3：出库中
			//int e = 0; //4：移入中
			//int f = 0; //5：移出中
			int e = 0; //4：移入中
			int f = 0; //5：移出中
			int g = 0; //6：损坏\屏蔽

			foreach (var item in getLocateVms)
			@@ -503,18 +503,18 @@
			d = 1; //3：出库中
			continue;
			}
			////4：移入中
			//if (item.Status == "4")
			//{
			// e = 1; //4：移入中
			// continue;
			//}
			////5：移出中
			//if (item.Status == "5")
			//{
			// f = 1; //5：移出中
			// continue;
			//}
			//4：移入中
			if (item.Status == "4")
			{
			e = 1; //4：移入中
			continue;
			}
			//5：移出中
			if (item.Status == "5")
			{
			f = 1; //5：移出中
			continue;
			}
			//6：损坏\屏蔽
			if (item.Status == "6")
			{
			@@ -559,24 +559,24 @@
			getLocateVm.Status = "3";
			getLocateVms.Add(getLocateVm);
			}
			////4：移入中
			//if (e == 0)
			//{
			// getLocateVm = new GetLocateVm();
			// getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			// getLocateVm.StatusNum = "0";
			// getLocateVm.Status = "4";
			// getLocateVms.Add(getLocateVm);
			//}
			////5：移出中
			//if (f == 0)
			//{
			// getLocateVm = new GetLocateVm();
			// getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			// getLocateVm.StatusNum = "0";
			// getLocateVm.Status = "5";
			// getLocateVms.Add(getLocateVm);
			//}
			//4：移入中
			if (e == 0)
			{
			getLocateVm = new GetLocateVm();
			getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			getLocateVm.StatusNum = "0";
			getLocateVm.Status = "4";
			getLocateVms.Add(getLocateVm);
			}
			//5：移出中
			if (f == 0)
			{
			getLocateVm = new GetLocateVm();
			getLocateVm.WareHouseNo = wareHouseNo; //仓库号
			getLocateVm.StatusNum = "0";
			getLocateVm.Status = "5";
			getLocateVms.Add(getLocateVm);
			}
			//6：损坏\屏蔽
			if (g == 0)
			{
			@@ -672,7 +672,7 @@
			throw new Exception("未找到对应储位");
			}
			//有物品、出库中数据源（库存明细表）
			if (storageLocat.Status == "1" \|\| storageLocat.Status == "3")
			if (storageLocat.Status == "1" \|\| storageLocat.Status == "3" \|\| storageLocat.Status == "5")
			{
			//库存明细
			List<DataStockDetail> stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.LocatNo == locatNo && w.IsDel == "0").ToList();
			@@ -750,6 +750,12 @@
			case "3":
			model.Status = "出库中";
			break;
			case "4":
			model.Status = "移入中";
			break;
			case "5":
			model.Status = "移出中";
			break;
			default:
			model.Status = "";
			break;

			@@ -55,7 +55,7 @@
			/// <param name="storeTime">储存期至</param>
			/// <param name="userId">操作人</param>
			/// <returns></returns>
			List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId);
			List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, string supplierLot, int userId);

			/// <summary>
			/// 补打标签

			@@ -911,7 +911,7 @@
			{
			return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
			}
			var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty), model.ProductionTime, model.ExpirationTime, model.StoreTime, int.Parse(userId));
			var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty), model.ProductionTime, model.ExpirationTime, model.StoreTime, model.SupplierLot, int.Parse(userId));
			return Ok(new { code = 0, msg = "生成箱码标签成功", data = list });
			}
			catch (Exception e)

			@@ -10,8 +10,9 @@
			"AppSettings": {
			//"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;",
			//"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
			"ConnectionString": "Server=127.0.0.1;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
			//"ConnectionString": "Server=127.0.0.1;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
			//"ConnectionString": "Server=192.168.62.200;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
			"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;"
			//"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
			//"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
			},