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

wtt

2026-03-19 2770c9950e43fc502ec37c966f4707ad071ad5fc

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -5259,7 +5259,7 @@
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/set_SaveQCPOStockInCheckBill_Json")]
        [HttpPost]
        [HttpGet]
        public object set_SaveQCPOStockInCheckBill_Json(Int64 HInterID, string HBillNo, string HSourceBillType, string HSourceBillNo, Int64 HSourceInterID, string sHSourceEntryID, Int64 HFirstCheckEmp, string HMaker)
        {
            try
@@ -5395,16 +5395,16 @@
                    oSub.HBadQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HBadQty"]);

                    oCn.RunProc("Insert Into QC_POStockInCheckBillSub " +
                    "(HInterID,HEntryID,,HBillNo_bak,HRemark" +
                    "(HInterID,HEntryID,HBillNo_bak,HRemark" +
                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
                    ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue" +
                    "HResult,HProcCheckEmp,HProcCheckTime" +
                    "HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty" +
                    ",HResult,HProcCheckEmp,HProcCheckTime" +
                    ",HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty" +
                    ") " +
                    " values(" + oMain.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oMain.HBillNo + "','" + oSub.HRemark + "'" +
                    ", " + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
                    ", " + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "'" +
                    ",'" + oSub.HResult + "'," + oSub.HProcCheckEmp.ToString() + "',getdate()" +
                    ",'" + oSub.HResult + "'," + oSub.HProcCheckEmp.ToString() + ",getdate()" +
                    ", " + oSub.HMaterID.ToString() + "," + oSub.HInStockQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HRightQty.ToString() + "," + oSub.HBadQty.ToString() +
                    ") ");
                }
@@ -5692,7 +5692,6 @@
                if (isSuccess == 1)
                {
                    string result = InvokeHelper.Save("QM_InspectBill", sJson); //保存

                    sRemark = sRemark + " ï¼›ç”ŸæˆCLOUD单据" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");

                    HReturn = result.ToString();
@@ -5716,6 +5715,24 @@
                    else
                    {
                        sRemark = sRemark + sJson;
                        // æäº¤å’Œä¿å­˜å•æ®
                        string result1 = string.Empty;
                        string result2 = string.Empty;
                        var fID = JObject.Parse(result)["Result"]["Id"].ToString();
                        var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                        var json = new
                        {
                            Ids = fID,
                        };

                        result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交
                        result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核
                        if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                        {
                            oCn.RollBack();
                            sErrMsg = $"来料检验单号：{fBillNo}，提交失败" + result;
                            return false;
                        }
                        oCn.Commit();
                    }
                }
@@ -14641,7 +14658,10 @@
                // åŽèˆŸå®¢æˆ·
                if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                {
                    HBarCode = HBarCode.Split('-')[0];
                    if (!string.IsNullOrWhiteSpace(HBarCode))
                    {
                        HBarCode = HBarCode.Split('-')[0];
                    }                   
                }

                // Mode = 1 è¡¨ç¤º æ‰«ç æ¨¡å¼ Mode = 2 è¡¨ç¤º é€‰å•æ¨¡å¼
@@ -14650,8 +14670,8 @@
                    //扫码模式需要解析条码获取HInterID和HEntryID
                    ds = oCn.RunProcReturn($@"
                    exec h_p_CheckBillBarCode_AnalysisBarcode 
                        @HBillType={HBillType},
                        @HSourceBillType={HSourceBillType},
                        @HBillType='{HBillType}',
                        @HSourceBillType='{HSourceBillType}',
                        @HBarCode='{HBarCode}',
                        @user = '{user}'
                    ", "h_p_CheckBillBarCode_AnalysisBarcode");
@@ -14671,14 +14691,14 @@
                // é€‰å•æ¨¡å¼ç›´æŽ¥é€’å…¥HInterID å’Œ HEntryID æ ¹æ® å–质检方案来源 èŽ·å– æ£€éªŒé¡¹ç›®
                if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                {
                    //华舟做末件的时候 è¦çŸ¥é“我这个条码 å¯¹åº”的数量是多少，只能把条码传入进去进行查找
                    ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType={HBillType},@HSourceBillType={HSourceBillType},
                        @HInterID={HInterID},@HEntryID={HEntryID},@HBarCode={HBarCode}", "h_p_CheckBillBarCode_CheckItem");
                    //华舟做末件的时候 è¦çŸ¥é“我这个条码 å¯¹åº”的数量是多少，只能把条码传入进去进行查找                   
                    ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
                        @HInterID='{HInterID}',@HEntryID='{HEntryID}',@HBarCode='{HBarCode}'", "h_p_CheckBillBarCode_CheckItem");
                }
                else
                {
                    ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType={HBillType},@HSourceBillType={HSourceBillType},
                        @HInterID={HInterID},@HEntryID={HEntryID}", "h_p_CheckBillBarCode_CheckItem");
                    ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
                        @HInterID='{HInterID}',@HEntryID='{HEntryID}'", "h_p_CheckBillBarCode_CheckItem");
                }
                   

@@ -14892,7 +14912,7 @@
        [HttpGet]
        public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
        {
            var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
            var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, sBillNo, HBillType, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
            if (oBar == null)
            {
                objJsonResult.code = "0";
@@ -14929,7 +14949,7 @@
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                objJsonResult.data = oDs.Tables[0];
                return objJsonResult;