blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
duhe
2023-08-03 c540d7b9bfaa05f10255b7bf25e8803ca77dd195 
 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs


@@ -132,7 +132,7 @@


                    list.Add("唯一条码");


                    list.Add("品种条码");


                    list.Add("批次条码");


                    //list.Add("托盘条码");


                    list.Add("托盘条码");


                }


                objJsonResult.code = "1";


                objJsonResult.count = 1;


@@ -156,6 +156,7 @@


        [HttpGet]


        public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID)


        {


            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);


            List<object> columnNameList = new List<object>();


            try


            {


@@ -177,27 +178,35 @@


                    case "生产订单":


                        tabname = "h_v_IFCLD_ICMOBillList_Source"; 


                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source "+sWhere+ " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案' order by å•æ®å·", tabname).Tables[0].Rows.Count;


                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å·) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案')   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å·) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案')   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        break;


                    case "生产汇报单":


                        tabname = "h_v_IF_ICMOReportBillList_Source";


                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;


                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        break;


                    case "采购订单":


                        tabname = "h_v_IF_POOrderBillList_Source";


                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;


                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        break;


                    case "收料通知单":


                        tabname = "h_v_IF_POInStockBillList_Source";


                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;


                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")


                        {


                            count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;


                            sql = string.Format(@"select * from(select  top 1000 row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        }


                        else


                        {


                            count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;


                            sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        }


                        break;


                    case "委外订单":


                        tabname = "h_v_IF_EntrustOrderBillList_Source";


                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;


                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        break;


                    case "生产入库单":


                        tabname = "h_v_IF_ProductInBillList_Source";


@@ -465,6 +474,7 @@




        public object HSourceOrderList1(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType,string HSourceBillType)


        {


            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);


            for (int i = 0; i < dt.Rows.Count; i++)


            {


                ordrlist.HQty = dt.Rows[i]["未生成条码数量"].ToString();


@@ -491,9 +501,12 @@




                if(HSourceBillType == "收料通知单")


                {


                    ordrlist.HFurnaceNO = dt.Rows[i]["炉号"].ToString();


                    ordrlist.HCoilNO = dt.Rows[i]["钢卷捆包号"].ToString();


                    ordrlist.HheatNO = dt.Rows[i]["热处理"].ToString();


                    if (oSystemParameter.omodel.WMS_CampanyName != "瑞与祺")


                    {


                        ordrlist.HFurnaceNO = dt.Rows[i]["炉号"].ToString();


                        ordrlist.HCoilNO = dt.Rows[i]["钢卷捆包号"].ToString();


                        ordrlist.HheatNO = dt.Rows[i]["热处理"].ToString();


                    }


                }




                if (HBarCodeType == "仪器外购件条码容器规则")


@@ -670,6 +683,7 @@


                string HSelectBarCodeType = sArray[3].ToString();


                string CampanyName = sArray[4].ToString()=="xxx"?"": sArray[4].ToString();


                string UserName = sArray[5].ToString();


                ClsPub.CurUserName = UserName;




                //获取内码


                HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);


@@ -959,10 +973,14 @@


                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);


                        LSHlen = 5;


                    }


                    //else if (cmbHBarCodeType.Text == "托盘条码")


                    //{


                    //    TM = HOrgNumber + HNumber + LSH2;


                    //}


                    else if (HSelectBarCodeType == "托盘条码")


                    {


                        LSHlen = 4;     //流水号长度


                        //条码前缀 = ç‰©æ–™å†…码 + å¹´ + æœˆ + æ—¥


                        sTMNumber = HNumber + sYear + sPeriod + sDay;


                        Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号


                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);


                    }


                    else


                    {


                        objJsonResult.code = "0";


@@ -1002,7 +1020,7 @@


                        {


                            LSH2 = "0" + LSH2;


                        }


                        if (HSelectBarCodeType == "唯一条码")


                        if (HSelectBarCodeType == "唯一条码" || HSelectBarCodeType == "托盘条码")


                        {


                            //条码编号 = æ¡ç å‰ç¼€ + æµæ°´å·


                            TM = sTMNumber + LSH2;