完成销售后端

wtt

2024-05-24 f339dd8204bbe0bff688db3c124139da33bb4960

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -575,6 +575,7 @@
                }
                sw.Stop();//结束计时
                LogService.Write($"11.参数查询结束,新增结束，用时" + sw.Elapsed);
                LogService.Write("END--出站单据保存结束，出站单号：" + HBillNo);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
@@ -583,6 +584,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("出站单据保存发生异常，出站单号：" + sArray[0].ToString());
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -2356,7 +2358,8 @@

                    oCn.BeginTran();

                    oCn.RunProc("delete from Sc_StationOutBillSub_SN where HInterID="+ HInterID+ " and HBarCode='"+ HBardcode + "'");
                    oCn.RunProc("delete from Sc_StationOutBillSub_SN where HInterID=" + HInterID + " and HBarCode='" + HBardcode + "'");
                    oCn.RunProc("update  Sc_StationOutBillMain set HQty-=1 where HInterID=" + HInterID);

                    oCn.Commit();

@@ -3223,19 +3226,30 @@
        #region  当前工单(扫码汇报) 条码查询
        [Route("Cj_StationOutBill_CurrentWork/SNHBardCodeList")]
        [HttpGet]
        public object SNHBardCodeList(string HBarCode, string user, int HOrgID)
        public object SNHBardCodeList(string HBarCode, string HProcID, int HOrgID)
        {
            try
            {
                DataSet dataSet = null;
                var num = 0;
                ds = oCN.RunProcReturn(@"select HSourceInterID,HSourceBillNo from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
              
                if (ds.Tables[0].Rows.Count > 0)
                {
                    string HSourceInterID = ds.Tables[0].Rows[0]["HSourceInterID"].ToString();
                    string HSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
                    num = 1;
                    dataSet = ds;
                }

                    ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");
                    string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
                ds = oCN.RunProcReturn(@"select HInterID,HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HBillNo='" + HBarCode + "'", "Sc_ProcessExchangeBillMain");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    num = 2;
                    dataSet = ds;
                }

                if (num == 1)
                {
                    string HSourceInterID = dataSet.Tables[0].Rows[0]["HSourceInterID"].ToString();
                    string HSourceBillNo = dataSet.Tables[0].Rows[0]["HSourceBillNo"].ToString();

                    ds = oCN.RunProcReturn("select  * from h_v_Sc_ProcessExchangeBillList where hmainid=" + HSourceInterID + " and 单据号='" + HSourceBillNo + "' and HProcID=" + HProcID, "h_v_Sc_ProcessExchangeBillList");

@@ -3252,7 +3266,30 @@
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else {
                else if (num == 2)
                {
                    string HSourceInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
                    string HSourceBillNo = dataSet.Tables[0].Rows[0]["HBillNo"].ToString();

                    ds = oCN.RunProcReturn("select  * from h_v_Sc_ProcessExchangeBillList where hmainid=" + HSourceInterID + " and 单据号='" + HSourceBillNo + "' and HProcID=" + HProcID, "h_v_Sc_ProcessExchangeBillList");

                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "条码:" + HBarCode + ",流转卡:" + HSourceBillNo + ",与当前流转卡,所对应的工序不存在!";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else 
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "条码查无数据!";