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

llj

2025-10-13 ce58bfdb73054fa181e0731d60f4c2e74798cabb

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -909,6 +909,8 @@
            string HSupNumber = ""; // ä¾›åº”商编码
            string HPOInStockBillNo = ""; // æ”¶æ–™é€šçŸ¥å•å·

            string HPOOrderBillNo = ""; // é‡‡è´­è®¢å•å·

            DataSet Ds;
            msg2 = msg2.Replace("\\", "");
            msg2 = msg2.Replace("\n", "");  //\n
@@ -959,6 +961,8 @@
                    
                    HPOInStockBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HBillNo); // æ”¶æ–™é€šçŸ¥å•å· å…´è¾¾æ¡ç 
                    HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);// ä¾›åº”商编号 å…´è¾¾æ¡ç 

                    HPOOrderBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HBillNo); // é‡‡è´­è®¢å•å· å°å«ç”µå™¨
                    //
                    sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
                    sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
@@ -1069,6 +1073,14 @@
                            Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                            LSHlen = 3; // ä¸‰ä½æµæ°´å·
                        }
                        else if (CampanyName.Contains("小卫"))
                        {
                            // å°å«ç”µå™¨
                            // æ¡ç å‰ç¼€ = å•æ®å· + ç‰©æ–™ç¼–码 + æ‰¹æ¬¡å·
                            sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
                            Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                        }
                        else  //通用方法
                        {
@@ -1824,7 +1836,7 @@
        }
        #endregion

        #region æ›´æ–°æ¡ç  å¯¹åº”单据 å•å· æ¬¡æ•° æ—¶é—´
        #region æ›´æ–°æ¡ç å¯¹åº”出库申请单号 å…´è¾¾
        public class BarCodeMeta
        {
            public string HBarCode { get; set; }
@@ -1851,23 +1863,24 @@
            string msg2 = sArray[0].ToString();
            string HBillType = sArray[1].ToString();
            string HBillNo = sArray[2].ToString();
            string HOrgName = sArray[3].ToString();

            List<BarCodeMeta> BarCodeMetaList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BarCodeMeta>>(msg2);
            oCN.BeginTran();
            try
            {
                oCN.BeginTran();

                for(int i = 0; i < BarCodeMetaList.Count; i++)
                {
                    if (HBillType == "1205") // é”€å”®å‡ºåº“
                    {
                        oCN.RunProcReturn("Update Gy_BarCodeBill set HOutStockDate = getdate(), HOutStockCounts=isnull(HOutStockCounts,0)+1," +
                           "HOutStockBillNo='" + HBillNo + " 'where HBarCode = '" + BarCodeMetaList[i].HBarCode + "'", "Gy_BarCodeBill");
                    }
                    if (HBillType == "1201") // é‡‡è´­å…¥åº“
                    {
                        oCN.RunProcReturn("Update Gy_BarCodeBill set HInStockDate = getdate(), HInStockCounts=isnull(HOutStockCounts,0)+1," +
                           "HInStockBillNo='" + HBillNo + " 'where HBarCode = '" + BarCodeMetaList[i].HBarCode + "'", "Gy_BarCodeBill");

                        if (HOrgName.Contains("兴达") && !string.IsNullOrEmpty(HBillNo))
                        {
                            // å…´è¾¾ é”€å”®å‡ºåº“æ›´æ–° å‘货通知单
                            oCN.RunProcReturn("Update Gy_BarCodeBill set " +
                            "HSeOutStockBillNo='" + HBillNo + "' where HBarCode = '" + BarCodeMetaList[i].HBarCode + "'", "Gy_BarCodeBill");
                        }
                        
                    }
                }
                
@@ -1879,6 +1892,7 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "修改失败!" + e.Message;
@@ -1890,12 +1904,12 @@
        #region [获取标签打印指令 CPCL指令]
        [Route("Sc_BarCode/Get_BarCodePrintCode_CPCL")]
        [HttpGet]
        public object Get_BarCodePrintCode_CPCL(string HOrginationName, string HViewName, string HBillSubType, int HInterID, int HItemID)
        public object Get_BarCodePrintCode_CPCL(string HOrginationName, string HBillSubType, int HInterID, int HItemID)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_getHBarCodePrintCode_CPCL N'" + HOrginationName + "'" +
                   ",N'" + HViewName + "',N'" + HBillSubType + "'," + HInterID + "," + HItemID, "h_p_getHBarCodePrintCode_CPCL");
                   ",N'" + HBillSubType + "'," + HInterID + "," + HItemID, "h_p_getHBarCodePrintCode_CPCL");
                if((int)ds.Tables[0].Rows[0]["resultType"] == 1)
                {
                    string resultMesg = ds.Tables[0].Rows[0]["payload"].ToString().Replace("\\r\\n", "\r\n");