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

wtt

2025-11-17 6ef126d9a9271afae02ee36469b1512e144bc555

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

 WarM/ÌõÂë´òÓ¡/Gy_CusBarCodeBill_KaiBei.cs

@@ -752,10 +752,15 @@
                                LSH2 = "0" + LSH2;
                            }

                            if (HBarCodeType == "锐捷标签" || HBarCodeType == "华勤标签" || HBarCodeType == "英业达标签")
                            if (HBarCodeType == "锐捷标签" || HBarCodeType == "英业达标签")
                            {
                                TM = sTMNumber + LSH2;
                            }
                            else if (HBarCodeType == "华勤标签")
                            {
                                //条码编号 = å®¢æˆ·æ–™å·+2位固定‘00’+年周+ æµæ°´å·ï¼ˆ4位）
                                TM = sHCusModelName + "00" + sYearWeek + LSH2;
                            }
                            else
                            //超聚变内标签
                            {

 WarM/ÌõÂë´òÓ¡/Gy_CusBarCodeBill_KaiBei_HuaSan.cs

@@ -710,7 +710,14 @@

                            HEntryID = j + 1;
                            HBarCode = TM.ToUpper();
                            if (cmbHCusName.Text.Contains("东方通信"))
                            {
                                HBarCodeType = "东方通信内箱码";
                            }
                            else
                            {
                            HBarCodeType = "新华三内箱码";
                            }
                            HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
                            HBatchNo = sYear4 + sPeriod2 + sDay;
                            HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
@@ -787,8 +794,8 @@
                        HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);  //销售订单号

                        //获取最大流水号
                        //条码前缀 = ä¾›åº”商代码 + é”€å”®è®¢å•å·
                        sWTMNumber = "151091" + HInnerBillNo;
                        //条码前缀 = 2位固定码（'09'） + CPN客户编码（规格型号）+ 2位预留码（固定'01'）+ 5位年年月日日（YYMDD） + 3位09码流水号（固定'001'） + ä¾›åº”商代码（固定'151091'）
                        sWTMNumber = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001151091";
                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sWTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                        LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);

@@ -816,11 +823,18 @@
                            }

                            //条码编号 = 2位固定码（'09'） + CPN客户编码（规格型号）+ 2位预留码（固定'01'）+ 5位年年月日日（YYMDD） + 3位09码流水号（固定'001'） + ä¾›åº”商代码（固定'151091'）+ 3位流水号
                            TM = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001151091" + LSH2;
                            TM = sWTMNumber + LSH2;

                            HEntryID = j + 1;
                            HBarCode = TM.ToUpper();
                            if (cmbHCusName.Text.Contains("东方通信"))
                            {
                                HBarCodeType = "东方通信外箱码";
                            }
                            else
                            {
                            HBarCodeType = "新华三外箱码";
                            }
                            HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
                            HBatchNo = sYear4 + sPeriod2 + sDay;
                            HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
@@ -903,7 +917,7 @@
        private void Display()
        {
            //刷新内箱码列表
            DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and æ¡ç ç±»åž‹='新华三内箱码' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
            DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (条码类型='新华三内箱码' or æ¡ç ç±»åž‹='东方通信内箱码) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题
            if (DSet == null)
            {
@@ -914,7 +928,7 @@
            grdSub.DataSource = DSet.Tables[0].DefaultView;

            //刷新外箱码列表
            DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and æ¡ç ç±»åž‹='新华三外箱码' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
            DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (条码类型='新华三外箱码' or æ¡ç ç±»åž‹='东方通信外箱码) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题
            if (DWSet == null)
            {
@@ -1049,7 +1063,7 @@
            grdMain.Columns[HEXPPERIODCol].Visible = false;
            grdMain.Columns[HLSHCol].Visible = false;
            grdMain.Columns[HBaNoCol].Visible = false;
            grdMain.Columns[HCusModelNameCol].Visible = false;
            //grdMain.Columns[HCusModelNameCol].Visible = false;
            grdMain.Columns[HCusModelCol].Visible = false;
            grdMain.Columns[HBatchNoCol].Visible = false;
            grdMain.Columns[HCode1Col].Visible = false;
@@ -1670,7 +1684,7 @@
        {
            try
            {
                oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType='新华三内箱码' and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('新华三内箱码','东方通信内箱码') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
            }
            catch (Exception e)
            {
@@ -1785,7 +1799,7 @@
        {
            try
            {
                oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType='新华三外箱码' and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('新华三外箱码','东方通信外箱码') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
            }
            catch (Exception e)
            {

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -2856,8 +2856,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "";
                    objJsonResult.data = "没有查询到数据";
                    objJsonResult.Message = "没有查询到数据";
                    objJsonResult.data = "";
                    return objJsonResult;
                }


 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -3586,6 +3586,36 @@
        }
        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’平台 ç›‘听单元格数据修改某一天的排产数量
        [Route("JIT_DayPlanPlatFormBill/UpdateDayPlanQty")]
        [HttpGet]
        public object UpdateDayPlanQty(int HWorkBillSortInterID, string HMasterDate, string HQty, string HSumWorkQty)
        {
            try
            {
                string sql = $"exec h_p_JIT_UpdateDayPlanQty {HWorkBillSortInterID},'{HMasterDate}','{HQty}','{HSumWorkQty}'";

                //更新或新增订单某一天的排产数量
                oCN.RunProc(sql);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "排产数量修改成功！";
                objJsonResult.data = "";
                return objJsonResult;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "排产数量修改失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’平台 æ ¹æ®è½¦é—´æ·»åŠ æœªæŽ’产生产订单（交期回复抓取）
        [Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept_Reply")]
        [HttpGet]