Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -133,25 +133,23 @@
                switch(model.Type)//0:原料 1:包材 2:成品 3:耗材 4:半成品
                {
                    case "0"://成品入库
                    case "3"://退货入库
                    case "5"://其它入库
                    case "6"://代储入库
                        skuType = "(2)";
                        break;
                    case "1"://采购入库
                    case "4"://车间余料退回入库
                        skuType = "(0,1,3)";
                        break;
                    case "2"://中间品入库
                        skuType = "(4)";
                        break;
                    case "3"://退货入库
                        skuType = "(2)";
                    case "7"://寄存入库
                        skuType = "(0,1,2,3,4)";
                        break;
                    case "4"://车间余料退回入库
                        skuType = "(0,1,3)";
                        break;
                    case "5"://其它入库
                        skuType = "(2)";
                        break;
                    case "6"://代储入库
                        skuType = "(2)";
                    default: //其它
                        skuType = "(0,1,2,3,4)";
                        break;
                }
@@ -208,6 +206,9 @@
            string strMessage = "";
            string sqlString = string.Empty;
            string sqlDetailStr = string.Empty;
            //0:成品入库 1:采购入库 2:中间品入库 3:退货入库 4:车间余料入库 5:其它入库 6:代储入库 7:寄存入库
            var TypeLot = "1, 2, 5, 6, 7";
            try
            {
                if (model.Origin == "录入")
@@ -251,9 +252,13 @@
                    }
                    if (string.IsNullOrEmpty(detailModel.LotNo))
                    {
                        //判断是否为不限制批次单据
                        if (!TypeLot.Contains(model.Type))
                        {
                        strMessage = "-1:批次号不可为空;";
                        continue;
                    }
                    }
                    // 判断是否已存在当前明细
                    string sqlCount = $"SELECT COUNT(ID) FROM BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' ";
                    sqlCount += $"and SkuNo ='{detailModel.SkuNo}' and LotNo = '{detailModel.LotNo}' and id != '{detailModel.Id}' and isdel = '0';";