新增器具调拨申请单模块所需调用方法，凯贝东方通信客户外箱码生成规则修改

yxj

7 天以前 699fa153dbce0964f31cd73c8bfc5d1fe2f78ef2

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

@@ -15,6 +15,8 @@
using System.Management;
using System.Net.NetworkInformation;
using System.Printing;
using WebAPI;
using Newtonsoft.Json;

namespace WarM
{
@@ -424,7 +426,11 @@
            }

            this.Sub_SaveBill();
            LogService.Write("==============================================================================================");
            LogService.Write("获取打印列表【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "】");
            Display();
            LogService.Write("获取打印列表结束【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "】");
            LogService.Write("==============================================================================================");

            if (radioButton_IsPrint_Yes.Checked == true)
            {
@@ -846,6 +852,7 @@
                        HWhID = ClsPub.isLong(grdSub.Rows[i].Cells[HWhID2Col].Value);
                        HSPID = ClsPub.isLong(grdSub.Rows[i].Cells[HSPID2Col].Value);
                        HRemark = ClsPub.isStrNull(grdSub.Rows[i].Cells[HRemark2Col].Value);
                        HRemark = "PLC自动生成";
                        HMaterName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterName2Col].Value);
                        HMaterModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value);
                        HPinfan = ClsPub.isStrNull(grdSub.Rows[i].Cells[HPinfan2Col].Value);
@@ -952,14 +959,14 @@
                string LIU = "";
                int LEN = 4;
                DataSet ds;
                string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),条码日期, 23) = '" + HDate + "' order by æ‰¹å· desc";
                string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),条码日期, 23) = '" + HDate + "' and å¤‡æ³¨ = 'PLC自动生成' order by æ‰¹å· desc";
                ds = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                if (ds != null)
                {
                    long count = 0;
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        count = ClsPub.isLong(ds.Tables[0].Rows[0]["批号"].ToString().Replace(sYear + sPeriod + sDay, ""));
                        count = ClsPub.isLong(ds.Tables[0].Rows[0]["批号"].ToString().Replace(sYear + sPeriod + sDay+" ", ""));
                    }
                    LIU += count + 1;
                    while (LIU.Length < LEN)  //如果流水号小于6位数前面补0
@@ -973,7 +980,7 @@
                }

                //拼接批号
                HBatchNo = sYear + sPeriod + sDay + LIU;
                HBatchNo = sYear + sPeriod + sDay+" " + LIU;
            }


@@ -1038,7 +1045,29 @@
            //拼接批号
            HBarCode_MaxNo = sYear + sPeriod + sDay + LIU;

            return HBarCode_MaxNo;
            long HBarCode_MaxNo_long = long.Parse(HBarCode_MaxNo);

            while (true)
            {
                int HCount_BarCodeBillList = 0;
                int HCount_SubBarCodeBill = 0;
                string sql_confirm = "select * from h_v_IF_BarCodeBillList where æ¡ç ç¼–号 = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and æ¡ç ç±»åž‹ = '唯一条码'" + " and CONVERT(varchar(100),条码日期, 23) = '" + HDate + "'";
                ds = oCn.RunProcReturn(sql_confirm, "h_v_IF_BarCodeBillList");
                HCount_BarCodeBillList = ds.Tables[0].Rows.Count;
                sql_confirm = "select * from Gy_BarCodeBill_SWELL_SubBarCodeBill Where HBarCode = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and HBarCodeType = '唯一条码'" + " and CONVERT(varchar(100),HMakeDate, 23) = '" + HDate + "'";
                ds = oCn.RunProcReturn(sql_confirm, "Gy_BarCodeBill_SWELL_SubBarCodeBill");
                HCount_SubBarCodeBill = ds.Tables[0].Rows.Count;
                if (HCount_BarCodeBillList + HCount_SubBarCodeBill > 0)
                {
                    HBarCode_MaxNo_long += 1;
                }
                else
                {
                    break;
                }
            }

            return HBarCode_MaxNo_long.ToString();
        }
        #endregion

@@ -1218,7 +1247,11 @@
                this.Sub_SaveBill();

                //获取需要打印的数据
                LogService.Write("==============================================================================================");
                LogService.Write("获取打印列表【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "】");
                Display();
                LogService.Write("获取打印列表结束【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "】");
                LogService.Write("==============================================================================================");

                if (radioButton_IsPrint_Yes.Checked == true)
                {
@@ -1249,6 +1282,8 @@
        //获取需要打印的数据并存放在子表grdList
        private void Display()
        {
            LogService.Write("打印列表搜索语句：【select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID】");

            //设置档案列表选项卡表格数据
            DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题
@@ -1265,6 +1300,8 @@
            DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
            //画线
            //GraphLine();

            LogService.Write("打印列表数据：【" + JsonConvert.SerializeObject(DSet.Tables[0]) + "】");
        }

        //获取工单当天物料生成的条码记录
@@ -2221,6 +2258,7 @@
                {
                    sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
                }
                sMoney = Math.Round(sMoney, 10);    // ä¿ç•™10位小数进行四舍五入
                sMoney = Math.Ceiling(sMoney);
                grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
            }