HTML/views/ASNSetting/ArrivalNotice.html

@@ -73,7 +73,7 @@
                                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="SkuNo" name="SkuNo" placeholder="物料编码" autocomplete="off"
@@ -86,7 +86,7 @@
                            <input type="text" id="SkuName" name="SkuName" placeholder="物料名称" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    </div> -->
                    <!-- <div  class="layui-inline">
                        <label  class="layui-form-label">单据类型</label>
                        <div class="layui-input-inline">
@@ -117,13 +117,13 @@
                            </select>
                        </div>
                    </div> -->
                    <div class="layui-inline">
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label" style="width: 90px;">上游系统单号</label>
                        <div class="layui-input-inline">
                            <input type="text" id="OrderCode" name="OrderCode" placeholder="上游系统单号"
                                autocomplete="off" class="layui-input">
                        </div>
                    </div>
                    </div> -->
                    <!-- <div class="layui-inline">
                        <label class="layui-form-label">客户名称</label>
                        <div class="layui-input-inline">
@@ -322,11 +322,7 @@
                                if(d.Status == "0"){ 
                                    html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del"> 
                                        <i class="layui-icon layui-icon-delete"></i>删除</a>`; 
                                }
                                if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){  
                                    html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel"> 
                                        <i class="layui-icon layui-icon-edit"></i>生成标签</a>`; 
                                }
                                }								
                                
                                return html;
                            } 

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -121,7 +121,7 @@
                            {{# function GetBtn1(d){
                                    var html = ''; 
                                    var TypeValue = $("#Type").val();
                                    if(TypeValue=='5' || TypeValue=='6' || TypeValue=='7'){	
                                    if(TypeValue=='6' || TypeValue=='7'){	
                                        if(d.LotNo==null || d.LotNo==undefined || d.LotNo==''){
                                            html+= '<input type="text" class="input-dis" value="" disabled>';
                                        }else{
@@ -519,9 +519,7 @@
                                break;
                            case "1": //采购入库
                            case "5": //其它入库
                                TypeNum = 1;
                                console.log(TypeNum)
                                break;
								
                            case "0": //成品入库
                            case "2": //中间品入库
                            case "4": //车间余料入库

 HTML/views/SOSetting/ExportNoticeAddFrom.html

@@ -397,14 +397,14 @@
                            isrun = 0;
                            return;
                        }
                        if (infoOptions.data[i].ExQty > infoOptions.data[i].Qty) {
                            layer.msg("出库数量不能大于库存数量！", {
                                icon: 2,
                                time: 2000 //2秒关闭（如果不配置，默认是3秒）
                            }, function() {});
                            isrun = 0;
                            return;
                        }
                        // if (infoOptions.data[i].ExQty > infoOptions.data[i].Qty) {
                        //     layer.msg("出库数量不能大于库存数量！", {
                        //         icon: 2,
                        //         time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        //     }, function() {});
                        //     isrun = 0;
                        //     return;
                        // }
                        var item = {
                            //SkuNo: infoOptions.data[i].SkuNo,
                            LotNo: infoOptions.data[i].LotNo,

 HTML/views/WareHouseSetting/Pallets.html

@@ -29,7 +29,7 @@
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 70px;">托盘条码：</label>
                            <label class="layui-form-label" style="width: 70px;">桶条码：</label>
                            <div class="layui-input-inline">
                                <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘条码" autocomplete="off" class="layui-input">
                            </div>

 Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs

@@ -277,7 +277,7 @@
            string sqlString = string.Empty;
            string sqlDetailStr = string.Empty;
            //0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料入库 5：其它入库 6：代储入库 7：寄存入库
            var TypeLot = "1, 5, 6, 7"; //批次可为空单据类型
            var TypeLot = "1, 6, 7"; //批次可为空单据类型

            try
            {
@@ -325,7 +325,7 @@
                        }
                        //判断是否为采购入库单据或车间余料退回入库
                        // 0：成品入库 1：采购入库 2：中间品入库 3：退货入库 4：车间余料退回入库 5：其它入库 6：代储入库 7：寄存入库
                        if (model.Type == "5" || model.Type == "6" || model.Type == "7")//model.Type == "1" || 
                        if (model.Type == "6" || model.Type == "7")//model.Type == "1" || 
                        {
                            if (!string.IsNullOrWhiteSpace(detailModel.LotNo))
                            {
@@ -357,7 +357,7 @@
                                detailModel.LotNo = maxLotNo;
                            }
                        }
                        if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4")
                        if (model.Type == "0" || model.Type == "2" || model.Type == "3" || model.Type == "4" || model.Type == "5")
                        {
                            if (string.IsNullOrWhiteSpace(detailModel.LotNo))
                            {

 Wms/WMS.BLL/BllTransServer/RcsServer.cs

@@ -672,10 +672,10 @@
                //查找储位
                var loctionModel = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.WareHouseNo == houseNo && areaNoList.Contains(w.AreaNo))
                    .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
                if (loctionModel == null)
                {
                    throw new Exception("该车间净桶区暂无空余储位");
                }
                //if (loctionModel == null)
                //{
                //    throw new Exception("该车间净桶区暂无空余储位");
                //}
                return loctionModel;
            }
            catch (Exception ex)