合并分支

chenhaozhe

2025-06-23 a2e882d3b9ad2a4ed118447c8b56216aaf95a5f7

合并分支

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 BLL/bin/x86/Release/BLL.dll

Binary files differ

 BLL/bin/x86/Release/BLL.pdb

Binary files differ

 BLL/bin/x86/Release/DAL.dll

Binary files differ

 BLL/bin/x86/Release/DAL.pdb

Binary files differ

 BLL/bin/x86/Release/DBUtility.dll

Binary files differ

 BLL/bin/x86/Release/DBUtility.pdb

Binary files differ

 BLL/bin/x86/Release/Model.dll

Binary files differ

 BLL/bin/x86/Release/Model.pdb

Binary files differ

 BLL/bin/x86/Release/Pub_Class.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/x86/Release/Pub_Control.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/x86/Release/SQLHelper.dll

Binary files differ

 BLL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 BLL/bin/x86/Release/TopSdk.dll

Binary files differ

 BLL/bin/x86/Release/TopSdk.pdb

Binary files differ

 DAL/DAL.csproj

@@ -86,6 +86,7 @@
    <Compile Include="基础资料\公用基础资料\ClsGy_RepairClass_Ctl.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_RepairCheckClass_Ctl.cs" />
    <Compile Include="仓库管理\ClsKf_ProductReceiveMaterialBill.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_MoveStockRequestBillList.cs" />
    <Compile Include="生产管理\ClsSc_ShiftsBeginInfoBill.cs" />
    <Compile Include="ClsPay_AbsentBill.cs" />

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/x86/Release/DAL.dll

Binary files differ

 DAL/bin/x86/Release/DAL.pdb

Binary files differ

 DAL/bin/x86/Release/DBUtility.dll

Binary files differ

 DAL/bin/x86/Release/DBUtility.pdb

Binary files differ

 DAL/bin/x86/Release/Model.dll

Binary files differ

 DAL/bin/x86/Release/Model.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Class.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Control.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/x86/Release/SQLHelper.dll

Binary files differ

 DAL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DAL/Ô´µ¥/InterFaceÔ´µ¥/Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei.cs

New file
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Text;
using SQLHelper;
using DBUtility;

namespace DAL
{
    public class Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei : Cls_S_Xt_BaseBill
    {

        public Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei()
        {
            base.ViewName = "h_v_Sc_ICMOBillList_Source_CusBarCodeBill_KaiBei";
            base.mvarReportTitle = "生产订单";
            base.mvarItemKey = "3710";
            base.sCondtion = "  ";
            base.sOrderSql = "  order by å•æ®å· desc,hsubid ";
            base.sKeyCol = "部门";
        }

    }
}

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

 Model/bin/x86/Release/DBUtility.dll

Binary files differ

 Model/bin/x86/Release/DBUtility.pdb

Binary files differ

 Model/bin/x86/Release/Model.dll

Binary files differ

 Model/bin/x86/Release/Model.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Class.dll

Binary files differ

 Model/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Control.dll

Binary files differ

 Model/bin/x86/Release/Pub_Control.pdb

Binary files differ

 Model/bin/x86/Release/SQLHelper.dll

Binary files differ

 Model/bin/x86/Release/SQLHelper.pdb

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 Model/obj/x86/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/x86/Release/Model.dll

Binary files differ

 Model/obj/x86/Release/Model.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.pdb

Binary files differ

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

@@ -76,7 +76,6 @@
        public int selectRow = 0;
        public Int64 HInterID = 0;      //内码
        public Int64 HOrgID = ClsPub.HOrgID;
        public string HCusModel = "Z";     //厂商代码
        public string sDate = "";          //日期
        public string sYear = "";          //年（2位）
        public string sYear4 = "";         //年（4位）
@@ -89,13 +88,9 @@
        //清空界面
        public void Sub_ClearBill()
        {
            cmbHBarCodeType.Items.Clear();
            cmbSourceBillType.Items.Clear();
            //条码类型
            cmbHBarCodeType.Items.Add("内箱码");
            cmbHBarCodeType.Items.Add("外箱码");
            //源单类型
            cmbSourceBillType.Items.Add("生产汇报单");
            cmbSourceBillType.Items.Add("生产订单");

            DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
            //获取当前组织
@@ -266,7 +261,7 @@
        //加载客户信息
        private void Sub_AddHCusNameList()
        {
            DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_Cus " + HOrgID.ToString(), "h_p_Gy_CusBarCodeBill_Cus");
            DataSet ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_Cus_KaiBei " + HOrgID.ToString(), "h_p_Gy_CusBarCodeBill_Cus_KaiBei");
            if (ds == null || ds.Tables[0].Rows.Count == 0)
            {
                cmbHCusName.DataSource = null;
@@ -457,54 +452,6 @@
            sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
            sDay = sDay.Substring(sDay.Length - 2, 2);
            //==================================
            switch (sYear)
            {
                case "22":
                    sYear = "N";
                    break;
                case "23":
                    sYear = "P";
                    break;
                case "24":
                    sYear = "Q";
                    break;
                case "25":
                    sYear = "R";
                    break;
                case "26":
                    sYear = "S";
                    break;
                case "27":
                    sYear = "T";
                    break;
                case "28":
                    sYear = "U";
                    break;
                case "29":
                    sYear = "V";
                    break;
                case "30":
                    sYear = "W";
                    break;
                case "31":
                    sYear = "X";
                    break;
                case "32":
                    sYear = "Y";
                    break;
                case "33":
                    sYear = "Z";
                    break;
                default:
                    sYear = "";
                    break;
            }
            if (sYear == "")
            {
                MessageBox.Show("错误的年份！");
                return false;
            }

            switch (sPeriod)
            {
                case "01":
@@ -561,14 +508,13 @@
                double HSourceQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HInitQtyCol].Value);             // æºå•æ•°é‡
                double HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);                       // æ•°é‡
                double HMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);                 // æœ€å°åŒ…装数
                string HCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);   // å®¢æˆ·æ–™å·
                string HCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);   // å®¢æˆ·ç‰©æ–™ç¼–码
                string HCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value);                 // ç‰©æ–™ç±»åˆ«
                string HCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value);                 // æ‰¹æ¬¡ä½
                HCode2 = HCode2.ToUpper();
                string HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);                 // ç‰ˆæœ¬å·
                string HBatchNoNumber = HCode1 + sYear + sPeriod + sDay + HCusModel;                                // æ‰¹æ¬¡ç”Ÿæˆå‰ç¼€
                HBatchNoNumber = HBatchNoNumber.ToUpper();
                string HBarCodeType = DBUtility.ClsPub.isStrNull(cmbHBarCodeType.Text);                             // æ¡ç ç±»åž‹
                string HBatchNoNumber = "";                                                                         // æ‰¹æ¬¡ç”Ÿæˆå‰ç¼€
                string HBarCodeType = "超聚变内标签";                                                               // æ¡ç ç±»åž‹
                string HInnerBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);     // å®¢æˆ·è®¢å•å·

                if (HMaterID != 0)
@@ -586,10 +532,6 @@
                    }
                    else
                    {
                        grdMain.Rows[j].Cells[HBaNoCol].Value = HCode2;
                        grdMain.Rows[j].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HBatchNo"]);
                        grdMain.Rows[j].Cells[HCode2Col].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HCode2"]);

                        if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
                        {
                            if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
@@ -648,17 +590,16 @@
            try
            {
                string TM = "";             //条码
                int LSHlen = 4;             //流水号长度
                int LSHlen = 7;             //流水号长度
                double HSumQty = 0;         //产品数量
                double HMinQty = 0;         //最小包装数
                int HBQty = 0;              //箱数
                int LSH = 0;                //内箱流水号
                int LWSH = 0;               //外箱流水号
                int LSH = 0;                //流水号
                string LSH2 = "";           //流水号转换成字符
                string HCode1 = "";         //物料类别
                string HCode2 = "";         //批次位
                string HCode3 = "";         //版本号
                string sTMNumber = "";      //外箱条码前缀
                string sTMNumber = "";      //条码前缀
                DataSet Ds;

                Int64 HEntryID = 0;
@@ -670,7 +611,7 @@
                string HBatchNo = "";       //批次
                double HQty = 0;            //数量
                Int64 HCusID = 0;           //客户ID
                string HCusModelName = "";  //客户料号
                string HCusModelName = "";  //客户物料编码
                bool HGiveAwayFlag = false; //赠品标记
                string HProduceDate;        //生产日期（保质期用）
                string HExpiryDate;         //保质期至（保质期用）
@@ -684,7 +625,7 @@
                string HMTONo = "";         //MTO号
                string HRemark = "";        //备注
                string HInnerBillNo = "";   //客户订单号
                string HSno = "";           //批次序列号
                string HSno = "";           //流水号
                string HBoxNo = "";         //批次生成前缀
                string sHBaNo = "";         //界面上输入的批次位
                int HSumBQty = 0;           //同一批生成条码总箱数
@@ -697,27 +638,14 @@
                    Application.DoEvents();
                    if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
                    {
                        HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
                        HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
                        string HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value);
                        HMaterNumber = HMaterNumber.Substring(HMaterNumber.Length - 3, 3);  //取物料代码后三位
                        string sHCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value);   //客户代码（取金蝶客户物料对应表客户物料编码）

                        if (cmbHBarCodeType.Text == "内箱码")
                        {
                            //获取最大流水号
                            LSH = 0;
                            Ds = oCn.RunProcReturn("select top 1 HSno from Gy_BarCodeBill_Cus where HBatchNo='" + HBatchNo + "' order by HSno desc", "Gy_BarCodeBill_Cus");
                            if (Ds != null && Ds.Tables[0].Rows.Count != 0)
                            {
                                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                            }
                        }
                        //外箱码   ä¾›åº”商代码（浪潮定义的供应商代码）+8位日期（例如20230905）+5位流水码（纯数字）
                        else
                        {
                            //条码前缀 = ä¾›åº”商代码 + å¹´ + æœˆ + æ—¥
                            sTMNumber = HCusModel + sYear + sPeriod + sDay;
                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                            LWSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                        }
                        //条码前缀 = å¹´ + æœˆ
                        sTMNumber = sYear + sPeriod;
                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);

                        HBQty = ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
                        HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
@@ -725,6 +653,7 @@
                        HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
                        pb1.Maximum = HSumBQty;

                        int nn = 0;     //本次流水号累计使用个数
                        for (int i = 0; i < HBQty; i++)
                        {
                            pb1.Value = n+1;    
@@ -737,32 +666,23 @@
                                HMinQty = HSumQty;
                            }
                            //
                            if (cmbHBarCodeType.Text == "内箱码")
                            LSH = LSH + 1;
                            LSH2 = LSH.ToString();
                            while (LSH2.Length < LSHlen)  //如果流水号位数小于 æµæ°´å·é•¿åº¦ å‰é¢è¡¥0
                            {
                                LSH = LSH + 1;
                                LSH2 = ConvertToBase(LSH, 36);
                                while (LSH2.Length < LSHlen)  //如果流水号位数小于 LSHlen å‰é¢è¡¥0
                                {
                                    LSH2 = "0" + LSH2;
                                }
                                //条码编号 = æ‰¹æ¬¡ + æµæ°´å· + ç‰ˆæœ¬å·
                                TM = HBatchNo + LSH2 + HCode3;
                                LSH2 = "0" + LSH2;
                            }
                            //外箱码
                            else
                            if (LSH2.Length != 7)
                            {
                                LWSH = LWSH + 1;
                                LSH2 = LWSH.ToString();
                                while (LSH2.Length < 5)  //如果流水号位数小于 5 å‰é¢è¡¥0
                                {
                                    LSH2 = "0" + LSH2;
                                }
                                TM = sTMNumber + LSH2;
                                MessageBox.Show("条码流水号为[" + LSH2 + "]，长度不允许超过7位！");
                                return;
                            }
                            //超聚变数字技术有限公司   æ¡ç ç¼–号（共26位） = ä»£ç ï¼ˆ1位固定‘S’） + åŽ‚商代码（2位固定‘Y3’） + å¹´ï¼ˆ2位年后两位） + æœˆï¼ˆ1位10=A,11=B,12=C） + æµæ°´å·ï¼ˆ7位） + ä»£å·ï¼ˆ2位固定‘1P’） + å®¢æˆ·ä»£ç ï¼ˆ8位取金蝶客户物料对应表客户物料编码） + ç‰©æ–™ç‰ˆæœ¬ï¼ˆ3位取物料编码后三位）
                            TM = "SY3" + sYear + sPeriod + LSH2 + "1P" + sHCusModelName + HMaterNumber;

                            HEntryID = j + 1;
                            HBarCode = TM.ToUpper();
                            HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
                            HBarCodeType = "超聚变内标签";
                            HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
                            HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
                            HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
@@ -782,16 +702,11 @@
                            HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
                            HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
                            HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
                            HCode1 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value).ToUpper();
                            HCode2 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value).ToUpper();
                            HCode3 = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value).ToUpper();
                            HSno = ClsPub.isStrNull(LSH);
                            HBoxNo = HCode1 + sYear + sPeriod + sDay + HCusModel;
                            HBoxNo = HBoxNo.ToUpper();
                            HBoxNo = sTMNumber;
                            sHBaNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBaNoCol].Value);                        // ç•Œé¢ä¸Šè¾“入的批次位

                            //客户料号HCusModelName、物料类别HCode1、批次位HCode2、版本号HCode3、批次序列号HSno、批次生成前缀HBoxNo、厂商代码HCusModel
                            //界面上输入的批次位HSupName、36进制批次序列号HSupNumber、客户订单号HInnerBillNo
                            //超聚变数字技术有限公司   å®¢æˆ·ç‰©æ–™ç¼–码HCusModelName、流水号HSno、流水号HSupNumber、流水号生成前缀HBoxNo
                            oCn.RunProc("insert into Gy_BarCodeBill_Cus" +
                                    "(HInterID,HEntryID,HBillType,HBarCode,HBarCodeType" +
                                    ",HMaterID,HUnitID,HAuxPropID,HBatchNo,HQty" +
@@ -807,7 +722,7 @@
                                    ",HCode2,HCode3,HBackDataFlag,HSno,HBoxNo" +
                                    ") values (" + HInterID + "," + HEntryID + ",'','" + HBarCode + "','" + HBarCodeType + "'"
                                    + "," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HAuxPropID.ToString() + ",'" + HBatchNo + "'," + HQty.ToString()
                                    + "," + HCusID.ToString() + ",'" + HCusModel + "','" + HCusModelName + "','" + sDate + "',''"
                                    + "," + HCusID.ToString() + ",'','" + HCusModelName + "','" + sDate + "',''"
                                    + "," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",''"
                                    + "," + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
                                    + "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",1,0"
@@ -818,8 +733,11 @@
                                    + ",'','','" + LSH2 + "','" + sHBaNo + "','" + HCode1 + "'"
                                    + ",'" + HCode2 + "','" + HCode3 + "','','" + HSno + "','" + HBoxNo + "')");
                            n = n + 1;
                            nn = nn + 1;
                            Application.DoEvents();
                        }
                        //回填流水号信息
                        oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
                    }
                }
                oCn.Commit();
@@ -904,7 +822,7 @@
            grdMain.Columns[HMaterNumberCol].HeaderText = "物料代码";
            grdMain.Columns[HMaterNameCol].HeaderText = "物料名称";
            grdMain.Columns[HMaterModelCol].HeaderText = "规格型号";
            grdMain.Columns[HCusModelNameCol].HeaderText = "客户料号";
            grdMain.Columns[HCusModelNameCol].HeaderText = "客户物料编码";
            grdMain.Columns[HUnitIDCol].HeaderText = "计量单位ID";
            grdMain.Columns[HUnitNumberCol].HeaderText = "计量单位代码";
            grdMain.Columns[HUnitNameCol].HeaderText = "计量单位名称";
@@ -945,6 +863,7 @@
            grdMain.Columns[HAuxPropNumberCol].Visible = false;
            grdMain.Columns[HAuxPropNameCol].Visible = false;
            grdMain.Columns[HBatchManagerCol].Visible = false;
            grdMain.Columns[HBatchNoCol].Visible = false;
            grdMain.Columns[HGiveAwayFlagCol].Visible = false;
            grdMain.Columns[HProduceDateCol].Visible = false;
            grdMain.Columns[HExpiryDateCol].Visible = false;
@@ -962,6 +881,10 @@
            grdMain.Columns[HEXPPERIODCol].Visible = false;
            grdMain.Columns[HLSHCol].Visible = false;
            grdMain.Columns[HBaNoCol].Visible = false;
            grdMain.Columns[HCode1Col].Visible = false;
            grdMain.Columns[HCode2Col].Visible = false;
            grdMain.Columns[HCode3Col].Visible = false;
            grdMain.Columns[HInnerBillNoCol].Visible = false;

            //设置可编辑列
            string sAllowCol =  HQtyCol.ToString()+
@@ -1278,7 +1201,16 @@

        private void cmdSourceBillNo_Click(object sender, EventArgs e)
        {
            if (cmbSourceBillType.Text.Trim() == "生产汇报单")
            if (cmbSourceBillType.Text.Trim() == "生产订单")
            {
                string sWhere = " and HOrgID =" + HOrgID.ToString();
                DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei oIF_ICMOBillList = new DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill_KaiBei();
                if (oIF_ICMOBillList.Refresh(sWhere))  //选择原单
                {
                    FillSelectData(oIF_ICMOBillList.oBillSelectColl);
                }
            }
            else if (cmbSourceBillType.Text.Trim() == "生产汇报单")
            {
                string sWhere = " and HOrgID =" + HOrgID.ToString();
                DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill();
@@ -1298,8 +1230,19 @@
            foreach (DBUtility.BillSelect oSelectRow in oList)
            {
                i = i + 1;
                //生产订单
                if (oSelectRow.BillType == "3710")
                {
                    grdMain.Rows.Add();
                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
                    //得到信息
                    Ds = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_ICMOBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString() + ",'1'", "h_p_Gy_CusBarCodeBill_ICMOBillList");
                    //写入信息
                    Sub_WriteInForm1(Ds.Tables[0], i);
                    GetCusMatNo(1);
                }
                //生产汇报单
                if (oSelectRow.BillType == "3711")
                else if (oSelectRow.BillType == "3711")
                {
                    grdMain.Rows.Add();
                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
@@ -1388,7 +1331,21 @@
                    return;
                }
                //根据源单类型 å’Œæºå•å· èŽ·å–信息
                if (cmbSourceBillType.Text.Trim() == "生产汇报单")
                if (cmbSourceBillType.Text.Trim() == "生产订单")
                {
                    DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill oIF_ICMOBillList = new DAL.Cls_S_IF_ICMOBillList_CusBarCodeBill();
                    if (oIF_ICMOBillList.RefreshBySourceBillNo(" Where å•æ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString()))  //选择原单
                    {
                        FillSelectData(oIF_ICMOBillList.oBillSelectColl);
                        txtHSourceBillNo.Text = "";
                    }
                    else
                    {
                        MessageBox.Show("未查询到任务数据，请确认所选组织、源单类型与源单单号是否正确！");
                        return;
                    }
                }
                else if (cmbSourceBillType.Text.Trim() == "生产汇报单")
                {
                    DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList_CusBarCodeBill();
                    if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where å•æ®å· like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString()))  //选择原单

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

@@ -55,8 +55,6 @@
            this.label2 = new System.Windows.Forms.Label();
            this.cmbHOrgID = new System.Windows.Forms.ComboBox();
            this.label3 = new System.Windows.Forms.Label();
            this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
            this.label1 = new System.Windows.Forms.Label();
            this.cmdHEmpID = new System.Windows.Forms.Button();
            this.cmdSourceBillNo = new System.Windows.Forms.Button();
            this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
@@ -325,8 +323,6 @@
            this.gbUp.Controls.Add(this.label2);
            this.gbUp.Controls.Add(this.cmbHOrgID);
            this.gbUp.Controls.Add(this.label3);
            this.gbUp.Controls.Add(this.cmbHBarCodeType);
            this.gbUp.Controls.Add(this.label1);
            this.gbUp.Controls.Add(this.cmdHEmpID);
            this.gbUp.Controls.Add(this.cmdSourceBillNo);
            this.gbUp.Controls.Add(this.txtHSourceBillNo);
@@ -397,25 +393,6 @@
            this.label3.Size = new System.Drawing.Size(53, 12);
            this.label3.TabIndex = 84;
            this.label3.Text = "组    ç»‡";
            // 
            // cmbHBarCodeType
            // 
            this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHBarCodeType.FormattingEnabled = true;
            this.cmbHBarCodeType.Location = new System.Drawing.Point(676, 46);
            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
            this.cmbHBarCodeType.Size = new System.Drawing.Size(188, 20);
            this.cmbHBarCodeType.TabIndex = 81;
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.ForeColor = System.Drawing.Color.Black;
            this.label1.Location = new System.Drawing.Point(609, 50);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(53, 12);
            this.label1.TabIndex = 80;
            this.label1.Text = "条码类型";
            // 
            // cmdHEmpID
            // 
@@ -923,8 +900,6 @@
        private System.Windows.Forms.Panel panel3;
        private System.Windows.Forms.DataGridView grdSum;
        private System.Windows.Forms.DataGridView grdPrint;
        private System.Windows.Forms.ComboBox cmbHBarCodeType;
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.ToolStripButton dy;
        private System.Windows.Forms.ComboBox cmbHOrgID;
        private System.Windows.Forms.Label label3;

 WebAPI/Controllers/»ªÔ¶datamapping/HY_DataMappingController.cs

@@ -601,7 +601,7 @@
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;  //成功！
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.data = ds.Tables[0].Rows[0]["HBarCode"].ToString();
                    return objJsonResult;
                }
            }
@@ -772,10 +772,16 @@
                }
                else
                {
                    List<string> HBarCodeList = new List<string>();
                    for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
                    {
                        HBarCodeList.Add(ds.Tables[0].Rows[i]["HBarCode"].ToString());
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;  //成功！
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.data = HBarCodeList;
                    return objJsonResult;
                }
            }

 WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2025-06-20T05:22:54.5321865Z;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
    <History>True|2025-06-20T06:33:10.9210583Z;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>06/20/2025 13:22:41</publishTime>
      <publishTime>06/20/2025 14:32:56</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>06/20/2025 13:22:41</publishTime>
      <publishTime>06/20/2025 14:32:56</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/20/2025 13:22:39</publishTime>
      <publishTime>06/20/2025 14:32:54</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>06/20/2025 13:22:39</publishTime>
      <publishTime>06/20/2025 14:32:54</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>06/20/2025 13:22:35</publishTime>
      <publishTime>06/20/2025 14:32:48</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>06/20/2025 13:22:35</publishTime>
      <publishTime>06/20/2025 14:32:48</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>06/20/2025 13:22:36</publishTime>
      <publishTime>06/20/2025 14:32:49</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>06/20/2025 13:22:36</publishTime>
      <publishTime>06/20/2025 14:32:49</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>06/20/2025 13:22:33</publishTime>
      <publishTime>06/20/2025 14:32:45</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>06/20/2025 13:22:33</publishTime>
      <publishTime>06/20/2025 14:32:45</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>06/20/2025 13:22:34</publishTime>
      <publishTime>06/20/2025 14:32:46</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>06/20/2025 13:22:34</publishTime>
      <publishTime>06/20/2025 14:32:46</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>06/20/2025 13:22:34</publishTime>
      <publishTime>06/20/2025 14:32:46</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>06/20/2025 13:22:34</publishTime>
      <publishTime>06/20/2025 14:32:46</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>06/20/2025 13:20:54</publishTime>
      <publishTime>06/20/2025 14:32:02</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>06/20/2025 13:20:54</publishTime>
      <publishTime>06/20/2025 14:32:02</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>06/20/2025 13:20:58</publishTime>
      <publishTime>06/20/2025 14:32:08</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>06/20/2025 13:20:58</publishTime>
      <publishTime>06/20/2025 14:32:08</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/20/2025 13:22:49</publishTime>
      <publishTime>06/20/2025 14:33:05</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/20/2025 13:22:49</publishTime>
      <publishTime>06/20/2025 14:33:05</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>06/20/2025 13:22:53</publishTime>
      <publishTime>06/20/2025 14:33:09</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ