Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zrg

2024-12-26 3c6cc14f02d25e0b854e9100a7a8657b1932483e

 WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs

@@ -30,6 +30,7 @@
            public DateTime HEndDate { get; set; }//结束时间
            public string ProcMul { get; set; }//工段
            public string Hmaker { get; set; }//当前登录人
            public string Arbitrarily { get; set; }//任意参数
        }

        [Route("Sc_CallGoodsBackRequestBill/JIT_CallGoodsBackRequestBillList")]
@@ -59,7 +60,7 @@
                CallGoodsBackRequest com = JsonConvert.DeserializeObject<CallGoodsBackRequest>(sWhere.ToString());

                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +
                    $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'", "h_p_JIT_BackGoodsRequestBillList_Query");
                        $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'", "h_p_JIT_BackGoodsRequestBillList_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -149,6 +150,7 @@
            public int? HWHID = 0;
            public string 退料原因 { get; set; }
            public int? 退回数量 = 0;
            public int? HSPID = 0;
        }

        [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_PZQR")]
@@ -221,14 +223,51 @@
            var _value = msg["msg"].ToString();
            string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string user = sArray[1].ToString();
            try
            {
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");

                objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
                objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
                objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                List<JIT_BackGoods_PZQR> listCa = new List<JIT_BackGoods_PZQR>();
                //获取表格数据集合
                listCa = JsonConvert.DeserializeObject<List<JIT_BackGoods_PZQR>>(msg2.ToString());

                int a = 0;
                for (int i = 0; i < listCa.Count; i++)
                {
                    ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_WHReceive {listCa[i].hmainid},{listCa[i].Hsubid}," +
                 $"{listCa[i].HSPID},'{user}'", "h_p_JIT_BackGoods_WHReceive");

                    if (ds.Tables[0].Rows[0][0].ToString() == "1")
                    {
                        a++;
                    }
                }
                if (a == listCa.Count)
                {
                    objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
                    objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
                    objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else if (a > 0 && a < listCa.Count)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未全部仓库接收!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
                    objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
                    objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {