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

wtt

10 天以前 6ef126d9a9271afae02ee36469b1512e144bc555

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

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

                            HEntryID = j + 1;
                            HBarCode = TM.ToUpper();
                            HBarCodeType = "新华三内箱码";
                            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();
                            HBarCodeType = "新华三外箱码";
                            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)
            {