ouyangqing
2021-02-25 dcbb1bd3499f2b90cc2a9457959c1f4dcab714a1
进出站
2个文件已修改
8 ■■■■ 已修改文件
WebAPI/Service/YqnDal.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Service/YqnQbService.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Service/YqnDal.cs
@@ -47,7 +47,7 @@
        public static List<Models.M_StationBillMail> GetStationInBillMailList(string icBillNo)
        {
            StringBuilder sqlBuilder = new StringBuilder();
            sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' and HICMOBillNo=@icBillNo");
            sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationInBillMain where HBillType='3790' and HProcExchBillNo=@icBillNo");
            var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
            return list;
        }
@@ -59,7 +59,7 @@
        public static List<Models.M_StationBillMail> GetStationOutBillMailList(string icBillNo)
        {
            StringBuilder sqlBuilder = new StringBuilder();
            sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') and HICMOBillNo=@icBillNo");
            sqlBuilder.Append("select HBillType,HInterID,HDate,HBillNo,HICMOBillNo,HEmpID,HProcID from Sc_StationOutBillMain where HBillType in ('3791','4788') and HProcExchBillNo=@icBillNo");
            var list = SqlPools.GetInstance("YqnConn").GetModelList<Models.M_StationBillMail>(sqlBuilder.ToString(), new { icBillNo });
            return list;
        }
WebAPI/Service/YqnQbService.cs
@@ -98,10 +98,10 @@
            {
                if (oMain.HProcID == 0 || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HProcExchBillNo) || oMain.HQty == 0 || string.IsNullOrEmpty(oMain.HBillNo))
                    return new ApiResult { code = 1, msg = "参数不全" };
                var stationInList = YqnDal.GetStationInBillMailList(oMain.HICMOBillNo);//获得该流转卡所有进站单
                var stationInList = YqnDal.GetStationInBillMailList(oMain.HProcExchBillNo);//获得该流转卡所有进站单
                if (stationInList.Count > 0)
                {
                    var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HICMOBillNo);//获得该流转卡所有出站单
                    var stationOutList = YqnDal.GetStationOutBillMailList(oMain.HProcExchBillNo);//获得该流转卡所有出站单
                    var stationInModel = stationInList.OrderByDescending(a => a.HDate).First();//获取进站单最新进站工序
                    if (stationOutList.Count == 0 && oMain.HProcID == stationInModel.HProcID)
                        return new ApiResult { code = -1, msg = "重复扫描" };