yusijie
2023-04-01 0ff18a7500fd1ec0c2b96c371b35d944a9bb5f0b
扫流转卡,扫仓库码,派工单。
3个文件已修改
78 ■■■■ 已修改文件
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LookingForBillController.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -164,22 +164,19 @@
                    NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
                    sBillBarCode = NewBarCode[0];
                }
                string sBillNo = sBillBarCode;
                string sBillNo = sBillBarCode; //条形码
                string[] arr = sBillNo.Split('&');
                string BillNo_PGD = arr[0];
                string entryid_PGD = "";
                string[] arr = sBillNo.Split('&'); //以符号‘&’分割条形码
                string BillNo_PGD = arr[0]; //单据号
                string entryid_PGD = "";//子id
                if(arr.Length > 1)
                {
                    entryid_PGD = arr[1];
                }
                //截取条码类型
                //截取条码类型 前三位
                string BillNoType = BillNo_PGD.Substring(0, Math.Min(3, BillNo_PGD.Length));
                //截取条码类型2
                //截取条码类型2 前四位
                string BillNoType2 = BillNo_PGD.Substring(0, Math.Min(4, BillNo_PGD.Length));
                //截取内码
                string BillNo = BillNo_PGD.Substring(3, Math.Min(BillNo_PGD.Length - 3, BillNo_PGD.Length));
@@ -189,7 +186,14 @@
                        ds = oCN.RunProcReturn("select * from h_v_Sc_ProcExchSendWorkBill  where 派工单据号 = '" + BillNo_PGD + "'" + " and HEntryID ='" + entryid_PGD + "'", "h_v_Sc_ProcExchSendWorkBill");
                        break;
                    case "GXLX"://流转卡
                        ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        if (entryid_PGD != "") //如果子id不为空则加入子id过滤;
                        {
                            ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'" + " and hsubid ='" + entryid_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        }
                        else
                        {
                            ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + BillNo_PGD + "'", "h_v_Sc_ProcessExchangeBillList");
                        }
                        break;
                }
                switch (BillNoType)
WebAPI/Controllers/CJGL/Sc_ProcExchSendWorkBillController.cs
@@ -150,10 +150,10 @@
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型
                    //oItemSub.HRemark = "";         //备注
                    oItemSub.HSourceInterID = 0;     // 源单主内码
                    oItemSub.HSourceEntryID = 0;   //源单子内码
                    //oItemSub.HSourceBillNo = "";  //源单单号
                    //oItemSub.HSourceBillType = ""; //源单类型
                    oItemSub.HSourceInterID = oItemSub.HSourceInterID;     // 源单主内码
                    oItemSub.HSourceEntryID = oItemSub.HSourceEntryID;   //源单子内码
                    oItemSub.HSourceBillNo = oItemSub.HSourceBillNo;  //源单单号
                    oItemSub.HSourceBillType = oItemSub.HSourceBillType; //源单类型
                    oItemSub.HRelationQty = 0;     //关联数量
            
                    oBill.DetailColl.Add(oItemSub);
WebAPI/Controllers/LookingForBillController.cs
@@ -339,6 +339,46 @@
        }
        /// <summary>
        /// 根据仓库二维码仓库相关信息
        /// </summary>
        /// <returns></returns>
        [Route("LookingFor/getWHName_Json")]
        [HttpGet]
        public object getWHName_Json(string HBarCode)
        {
            try
            {
                long HWHID = int.Parse(HBarCode.Remove(0, 3));
                string sWhere = " Where HItemID = " + HWHID + "";
                ds = getWhName_Json_s(sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// 启用mes仓位,根据老仓库转换成新仓库
        /// </summary>
        /// <returns></returns>
@@ -530,6 +570,12 @@
            return new SQLHelper.ClsCN().RunProcReturn("select HWHID,* from h_v_IF_StockPlace " + sWhere, "h_v_IF_StockPlace");
        }
        //根据仓库二维码带出仓库相关信息
        public static DataSet getWhName_Json_s(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_Warehouse " + sWhere, "h_v_IF_Warehouse");
        }
        //启用mes仓位,根据老仓库转换成新仓库
        public static DataSet GetSpNameMES_Json_s(string HERPWHID)
        {