yangle
2025-04-29 0a0d8bdfc13d6b780aa37b3b08e702fc96e6b892
翻译
2个文件已修改
116 ■■■■■ 已修改文件
WebAPI/Controllers/LMESController.cs 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_GroupOrderBillController.cs 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs
@@ -323,7 +323,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.Message = "[0000-1-045]没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -331,7 +331,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.Message = "[0000-1-037]获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
@@ -340,7 +340,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.Message = "[0000-1-010]没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -371,7 +371,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!";
                objJsonResult.Message = "[0000-1-045]没有返回任何记录!";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -379,7 +379,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功!";
                objJsonResult.Message = "[0000-1-050]获取信息成功!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
@@ -738,13 +738,14 @@
                    ds1 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp where HSourceBillNo = '" + SubBarcode + "' and HBillType = '" + HBillType + "'", "KF_PonderationBillMain_Temp");
                    if (ds1.Tables[0].Rows.Count > 0)
                    {
                        return CustomError("该子件条码已存在");
                        return CustomError("[0000-2-039]该子件条码已存在");
                    }
                    if (HBarCode == null || HBarCode.Equals(""))
                    {
                        HBarCode = " ";
                    }
                    ds = oCN.RunProcReturn("exec h_p_Save_SubBarcodeToTmp '" + HBillNo + "','" + SubBarcode + "','" + HInterID + "','" + HBillNo2 + "','" + HBillType + "','" + sMaker + "','" + HBarCode + "','" + HNumber + "','" + HName + "','" + HModel + "'", "h_p_Save_SubBarcodeToTmp");
                    LogService.Write("ID:" + HInterID + ",流转卡号:" + HBillNo + ",单据号:" + HBillNo2 + ",条码:" + SubBarcode + ",托条码:" + HBarCode);
                }
            }
@@ -909,7 +910,7 @@
                string HSNum2 = GetNewCodeByNum(HSNum,1,2);
                if (HBillNo == null || HBillNo.Equals(""))
                {
                    return CustomError("流转卡号不能为空!");
                    return CustomError("[0000-1-057]流转卡号不能为空!");
                }
                else
                {
@@ -920,7 +921,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常!"+e.ToString();
                objJsonResult.Message = "[0000-1-051]异常!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -1002,6 +1003,41 @@
            }
            return CustomCorrect(ds);
            //return ds.Tables[0].Rows;
        }
        //更新没有反写的数据
        [Route("LEMS/SaveToSc_PackUnionBillSub_Back")]
        [HttpGet]
        public object SaveToSc_PackUnionBillSub_Back(string HInterID, string HRemark)
        {
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID == null || HInterID.Equals(""))
                {
                    return CustomError("[0000-2-058]更新失败HitemID为空!");
                }
                else
                {
                    oCN.RunProc("exec h_p_Save_KF_PonderationBillMain_TempToSc_PackUnionBillSub_Back '" + HInterID + "','" + HRemark + "'");
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "[0000-2-059]更新成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[0000-2-058]" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
@@ -1243,7 +1279,7 @@
                oCN.RunProc("Delete from KF_PonderationBillMain_Temp where HInterID = " + HInterID);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功!";
                objJsonResult.Message = "[0000-1-008]删除成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -1251,7 +1287,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败!";
                objJsonResult.Message = "[0000-1-007]删除失败!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
@@ -1369,7 +1405,7 @@
                oCn.RunProc("Delete TOP(1) from KF_PonderationBillMain_Temp where HInterID = " + sHInterID + " and HSourceBillNo = '" + HSourceBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功!";
                objJsonResult.Message = "[0000-1-008]删除成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -1377,7 +1413,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败!";
                objJsonResult.Message = "[0000-1-007]删除失败!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
@@ -1408,7 +1444,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "当前条码的状态为:"+ ds.Tables[0].Rows[0]["HReasult"].ToString() + "!";
                    objJsonResult.Message = "[0000-2-037]当前条码的状态为:" + ds.Tables[0].Rows[0]["HReasult"].ToString() + "!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1425,7 +1461,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常!";
                objJsonResult.Message = "[0000-1-010]异常!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
@@ -1455,7 +1491,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无数据!";
                    objJsonResult.Message = "[0000-1-045]查无数据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1463,7 +1499,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "!";
                    objJsonResult.Message = "[0000-1-051]"+ ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1475,7 +1511,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "查无数据!";
                        objJsonResult.Message = "[0000-1-045]查无数据!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -1483,7 +1519,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                        objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                        return objJsonResult;
                    }
                    else {
@@ -1499,7 +1535,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常!";
                objJsonResult.Message = "[0000-1-010]异常!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
@@ -1522,7 +1558,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无数据!";
                    objJsonResult.Message = "[0000-1-045]查无数据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1530,7 +1566,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                    objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                    return objJsonResult;
                }
                else
@@ -1546,7 +1582,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常!";
                objJsonResult.Message = "[0000-1-010]异常!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
@@ -1574,7 +1610,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = Convert.ToString(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.Message = "[0000-1-051]" + Convert.ToString(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1583,7 +1619,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常!";
                objJsonResult.Message = "[0000-1-010]异常!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
WebAPI/Controllers/Sc_GroupOrderBillController.cs
@@ -39,7 +39,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请输入装箱码!";
                    objJsonResult.Message = "[3783-2-003]请输入装箱码!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -51,7 +51,7 @@
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();//该装箱单已扫码!
                        objJsonResult.Message = "[0000-1-038]" + ds.Tables[0].Rows[0][1].ToString();//该装箱单已扫码!
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -65,7 +65,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!无数据,请确认装箱码是否存在!";
                    objJsonResult.Message = "[3783-2-004]false!无数据,请确认装箱码是否存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -73,7 +73,7 @@
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.Message = "[0000-1-037]Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
@@ -82,7 +82,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.Message = "[0000-1-038]Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -122,7 +122,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"黑标号{HBarCode_Cus}已存在";
                    objJsonResult.Message = $"[3783-2-007]黑标号{HBarCode_Cus}已存在";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -156,16 +156,16 @@
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功!";
                objJsonResult.Message = "[0000-1-050]新增单据成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                //oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.Message = "[0000-1-051]Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -200,7 +200,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无数据!";
                    objJsonResult.Message = "[0000-1-045]无数据!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -208,7 +208,7 @@
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.Message = "[0000-1-037]Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
@@ -218,7 +218,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.Message = "[0000-1-010]Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -321,7 +321,7 @@
                oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HBarCode = '" + BarCode + "' and HBillType = '2601'");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功!";
                objJsonResult.Message = "[0000-1-008]删除成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -329,7 +329,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败!";
                objJsonResult.Message = "[0000-1-007]删除失败!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }
@@ -390,7 +390,7 @@
                oCn.RunProc("update Sc_PackUnionBillMain set HBarCode_Cus = '" + HBarCode_Cus + "' where HInterID = " + HInterID);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改成功!";
                objJsonResult.Message = "[[0000-1-067]]修改成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -398,7 +398,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "修改失败!";
                objJsonResult.Message = "[0000-1-066]修改失败!";
                objJsonResult.data = e.ToString();
                return objJsonResult;
            }