duhe
2026-01-05 a5785e2a06db28ff8459fff2837a9f79ae7d8568
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs
@@ -207,11 +207,11 @@
                        if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
                        {
                            count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                            sql = string.Format(@"select * from(select  top 1000 row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                            sql = string.Format(@"select * from(select top 1000 row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        }
                        else
                        {
                            count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                            count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•据号 desc,hsubid ", tabname).Tables[0].Rows.Count;
                            sql = string.Format(@"select * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        }
                        break;
@@ -303,6 +303,148 @@
            return objJsonResult;
        }
        #endregion
        #region [通过源单类型查找不同单据信息] ä½¿ç”¨æ–°çš„分页方式
        [Route("Sc_BarCode/ReportFromBillList_New")]
        [HttpGet]
        public object ReportFromBillList_New(int page, int limit, string sWhere, string HSouceBillType, string HOrgID)
        {
            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
            List<object> columnNameList = new List<object>();
            try
            {
                int count = 0;
                int pageNum = page;
                int pageSize = limit;
                string sql = "";
                string tabname = "";
                if (sWhere == null || sWhere.Equals(""))
                {
                    sWhere = " where 1=1 and HOrgID='" + HOrgID + "' ";
                }
                else
                {
                    sWhere = " where 1=1 and HOrgID='" + HOrgID + "' " + sWhere;
                }
                switch (HSouceBillType)
                {
                    case "生产订单":
                        tabname = "h_v_IFCLD_ICMOBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案' order by å•据号", tabname).Tables[0].Rows.Count;
                        sql = string.Format($@"select * from h_v_IFCLD_ICMOBillList_Source {sWhere} and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案' order by å•据号 offset {(pageNum - 1)*pageSize} rows fetch next {pageSize} rows only;");
                        break;
                    case "生产汇报单":
                        tabname = "h_v_IF_ICMOReportBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "采购订单":
                        tabname = "h_v_IF_POOrderBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format($@"select * from h_v_IF_POOrderBillList_Source {sWhere} order by å•据号 offset {(pageNum - 1)*pageSize} rows fetch next {pageSize} rows only;");
                        break;
                    case "收料通知单":
                        tabname = "h_v_IF_POInStockBillList_Source";
                        if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
                        {
                            count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                            sql = string.Format(@"select * from(select top 1000 row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        }
                        else
                        {
                            count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•据号 desc,hsubid ", tabname).Tables[0].Rows.Count;
                            sql = string.Format($@"select * from h_v_IF_POInStockBillList_Source {sWhere} order by å•据号 offset {(pageNum - 1) * pageSize} rows fetch next {pageSize} rows only; ");
                        }
                        break;
                    case "委外订单":
                        tabname = "h_v_IF_EntrustOrderBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "生产入库单":
                        tabname = "h_v_IF_ProductInBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_ProductInBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "采购入库单":
                        tabname = "h_v_IF_POStockInBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_POStockInBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "销售退货单":
                        tabname = "h_v_IF_SellOutBackBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBackBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBackBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "生产退料单":
                        tabname = "h_v_IF_MateOutBackBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBackBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBackBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "工序流转卡":
                        tabname = "h_v_IF_ProcessExchangeBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProcessExchangeBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_ProcessExchangeBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "销售出库单":
                        tabname = "h_v_IF_SellOutBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    case "领料出库单":
                        tabname = "h_v_IF_MateOutBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList_Source " + sWhere + " order by å•据号 desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•据号 desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        break;
                    default:
                        break;
                }
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, tabname);
                string aa = ds.Tables[0].Columns[0].ToString();
                //ds.Tables[0].Columns["hmainid"].ColumnName.ToUpper();
                //ds.Tables[0].Columns["hsubid"].ColumnName.ToUpper();
                ds.Tables[0].Columns["hmainid"].ColumnName = "HMainID";
                ds.Tables[0].Columns["hsubid"].ColumnName = "HSubID";
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = count;
                    objJsonResult.Message = "获取资源绑定数据成功!";
                    objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //序列化DataSet中的时间格式,然后再反序列化回来
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "暂无资源绑定!";
                    objJsonResult.data = null;
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message.ToString();
                objJsonResult.data = null;
                objJsonResult.list = columnNameList;
            }
            return objJsonResult;
        }
        #endregion
        #region [通过条码编号获取HItemId]
        [Route("Sc_BarCode/Get_HItemId")]
@@ -557,9 +699,17 @@
                ordrlist.HUnitName = dt.Rows[i]["计量单位"].ToString();
                ordrlist.HRemark = dt.Rows[i]["备注"].ToString();
                ordrlist.HMTONo = dt.Rows[i]["计划跟踪号"].ToString();
                ordrlist.HProduceDate = DBUtility.ClsPub.isDate(dt.Rows[i]["生产日期"]);
                ordrlist.HExpiryDate = DBUtility.ClsPub.isDate(dt.Rows[i]["有效期至"]);
                ordrlist.HISKFPERIOD = int.Parse(dt.Rows[i]["HISKFPERIOD"].ToString());
                ordrlist.HEXPUNIT = dt.Rows[i]["HEXPUNIT"].ToString();                          //有效期单位(日、月、年)
                ordrlist.HEXPPERIOD = double.Parse(dt.Rows[i]["HEXPPERIOD"].ToString());        //有效期值
                if(HSourceBillType == "收料通知单")
                if (HSourceBillType == "收料通知单")
                {
                    ordrlist.HAuxPropID = dt.Rows[i]["HAuxPropID"].ToString();
                    ordrlist.HAuxPropNumber = dt.Rows[i]["辅助属性代码"].ToString();
                    ordrlist.HAuxPropName = dt.Rows[i]["辅助属性"].ToString();
                    if (oSystemParameter.omodel.WMS_CampanyName.Contains("四维尔"))
                    {
@@ -602,6 +752,8 @@
                        {
                            ordrlist.HGiveAwayFlag = 0;
                        }
                        ordrlist.HSeOrderBillNo = dt.Rows[i]["销售订单号"].ToString();
                        ordrlist.HSeOrderSEQ = int.Parse(dt.Rows[i]["销售订单行号"].ToString());
                    }
                    if (HSourceBillType == "收料通知单" || HSourceBillType == "采购订单")
                    {
@@ -916,7 +1068,6 @@
            string HPOInStockBillNo = ""; // æ”¶æ–™é€šçŸ¥å•号
            string HPOOrderBillNo = ""; // é‡‡è´­è®¢å•号
            DataSet Ds;
            msg2 = msg2.Replace("\\", "");
            msg2 = msg2.Replace("\n", "");  //\n
@@ -927,6 +1078,7 @@
                if (ClsPub.isLong(ordrlist[j].HMaterID) != 0)
                {
                    HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
                    HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);//供应商
                    HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
                    HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);
@@ -1082,11 +1234,24 @@
                        }
                        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]);
                            if(HSourceBillTypeName== "采购订单")
                            {
                                //条码规则为:物料编码-供应商编码-来料批号-来料数量-采购订单编码
                                sTMNumber = HMaterNumber + "-" + HSupNumber + "-" + HBatchNo + "-" + HBQty + "-" + HPOInStockBillNo;
                                Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                                LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                            }
                            else
                            {
                                // å°å«ç”µå™¨
                                // æ¡ç å‰ç¼€ = å•据号 + ç‰©æ–™ç¼–码 + æ‰¹æ¬¡å·
                                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  //通用方法
                        {
@@ -1285,7 +1450,7 @@
                                TM = HNumber + "@" + sHMTONo.Replace(" ","") + "@" + HBatchNo.Replace(" ","") + "@" + sHQty;
                            }
                        }
                        barcode.HBarCode2 = TM;
                        barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
                        barcode.HMaterID2 = ordrlist[j].HMaterID;
@@ -1426,6 +1591,7 @@
                        {
                            HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
                        }
                        //
                        HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
                        HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
@@ -2536,6 +2702,341 @@
        }
        #endregion
        #region [条码生成接口-锦隆]
        [Route("Sc_BarCode/Sub_SaveBill_JinLong")]
        [HttpPost]
        public object Sub_SaveBill_JinLong([FromBody] JObject msg)
        {
            try
            {
                var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();                                             //物料记录
                string HOrgType = sArray[1].ToString();                                         //组织名称
                string HSourceBillTypeName = sArray[2].ToString();                              //源单类型名称
                string CampanyName = sArray[3].ToString() == "xxx" ? "" : sArray[4].ToString(); //加工工厂名称
                string UserName = sArray[4].ToString();                                         //登录账号
                ClsPub.CurUserName = UserName;
                string HSelectBarCodeType = "唯一条码";                                         //条码类型
                //获取内码
                HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
                DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
                HOrgNumber = "";
                if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
                {
                    HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
                    HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
                }
                if (HOrgID == -1)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-2-055]选择组织有错误!";
                    return objJsonResult;
                }
                if (!Sub_AllowSave(msg2, HSelectBarCodeType))//单据完整性判断
                {
                    return objJsonResult;
                }
                //生成条码
                SaveBarCode_JinLong(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName);
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[3899-2-006]条码生成失败!" + e.Message;
                return objJsonResult;
            }
            return objJsonResult;
        }
        #endregion
        #region[条码生成方法_锦隆]
        private object SaveBarCode_JinLong(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName)
        {
            DateTime sDate = DateTime.Now;                      //日期
            string HSourceBillType_Temp = "";                   //源单类型
            int n = 0;                                          //同批生成的条码索引
            //获取明细信息
            msg2 = msg2.Replace("\\", "");
            msg2 = msg2.Replace("\n", "");  //\n
            List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
            List<HBarCodeList> ListRows = new List<HBarCodeList>();
            DataSet Ds;
            for (int i = 0; i < ordrlist.Count; i++)
            {
                HSourceBillType_Temp = ordrlist[i].HBillType;
                if (ClsPub.isLong(ordrlist[i].HMaterID) != 0)
                {
                    if (HSelectBarCodeType == "唯一条码")
                    {
                        //拆分每条物料记录为多条条码记录
                        double HSumQty = ClsPub.isDoule(ordrlist[i].HQty);                                                                      //产品数量
                        double HQty = ClsPub.isDoule(ordrlist[i].HQty);                                                                         //数量
                        double HMinQty = ClsPub.isDoule(ordrlist[i].HMinQty);                                                                   //最小包装数
                        int HBQty = ClsPub.isInt(ordrlist[i].HBQty);                                                                            //箱数
                        string WeiShu = "";                                                                                                     //尾数
                        for (int j = 0; j < HBQty; j++)
                        {
                            //单个条码数量
                            if (HSumQty - HMinQty > 0)
                            {
                                WeiShu = "";
                                HSumQty = HSumQty - HMinQty;
                            }
                            else
                            {
                                if (HSumQty == HMinQty)
                                {
                                    WeiShu = "";
                                }
                                else
                                {
                                    WeiShu = "尾数";
                                }
                                HMinQty = HSumQty;
                            }
                            string HBarCode_Temp = "";                                                                                          //条码
                            string sTMNumber = "";                                                                                              //条码前缀
                            string LSH = "";                                                                                                    //最大流水号
                            int HLen = 4;                                                                                                       //流水号长度
                            //条码拼接所需字段
                            string HPOOrderBillMTO_TMN = DBUtility.ClsPub.isStrNull(ordrlist[i].HPOOrderBillMTO);                               //采购跟踪号
                            //条码前缀 = é‡‡è´­è·Ÿè¸ªå·
                            sTMNumber = HPOOrderBillMTO_TMN;
                            //根据条码前缀获取最大流水号
                            Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
                            LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
                            //条码编号 = é‡‡è´­è·Ÿè¸ªå· + ç‰©æ–™ä»£ç  + ç”Ÿäº§æ—¥æœŸ(yyyy/MM/dd) + å•箱数量 + 4位流水号
                            string HMaterNumber_BarCode = DBUtility.ClsPub.isStrNull(ordrlist[i].HMaterNumber);
                            string HInspectionDate_BarCode = DBUtility.ClsPub.isStrNull(ordrlist[i].HInspectionDate).Replace("-", "/");
                            string HQty_BarCode = ClsPub.isStrNull(HMinQty);
                            HBarCode_Temp = HPOOrderBillMTO_TMN + "|" + HMaterNumber_BarCode + "|" + HInspectionDate_BarCode + "|" + HQty_BarCode + "|" + LSH;
                            HBarCodeList barcode = new HBarCodeList();
                            barcode.HBarCode2 = HBarCode_Temp;
                            barcode.HBarCodeType2 = "唯一条码";
                            barcode.HBarCodeSubType2 = "";
                            barcode.HEntryID2 = ClsPub.isStrNull(i + 1);
                            barcode.HMaterID2 = ordrlist[i].HMaterID;
                            barcode.HMaterNumber2 = ordrlist[i].HMaterNumber;
                            barcode.HMaterName2 = ordrlist[i].HMaterName;
                            barcode.HMaterModel2 = ordrlist[i].HMaterModel;
                            barcode.HPinfan2 = ordrlist[i].HPinfan;
                            barcode.HPinfanBarCode2 = ordrlist[i].HPinfanBarCode;
                            barcode.HAuxPropID2 = ordrlist[i].HAuxPropID;
                            barcode.HAuxPropNumber2 = ordrlist[i].HAuxPropNumber;
                            barcode.HAuxPropName2 = ordrlist[i].HAuxPropName;
                            barcode.HUnitID2 = ordrlist[i].HUnitID;
                            barcode.HUnitNumber2 = ordrlist[i].HUnitNumber;
                            barcode.HUnitName2 = ordrlist[i].HUnitName;
                            barcode.HQty2 = ClsPub.isStrNull(HMinQty);
                            barcode.HBatchNo2 = ordrlist[i].HBatchNo;
                            barcode.HSourceInterID2 = ordrlist[i].HMainID;
                            barcode.HSourceEntryID2 = ordrlist[i].HSubID;
                            barcode.HSourceBillNo2 = ordrlist[i].HBillNo;
                            barcode.HSourceBillType2 = ordrlist[i].HBillType;
                            barcode.HPrint = "0";
                            barcode.HWei = WeiShu;
                            barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
                            barcode.HBarcodeQtys = ordrlist[i].HBQty;
                            barcode.HSupID2 = ordrlist[i].HSupID;
                            barcode.HSupNumber2 = ordrlist[i].HSupNumber;
                            barcode.HSupName2 = ordrlist[i].HSupName;
                            barcode.HDeptID2 = ordrlist[i].HDeptID;
                            barcode.HDeptNumber2 = ordrlist[i].HDeptNumber;
                            barcode.HDeptName2 = ordrlist[i].HDeptName;
                            barcode.HRemark2 = ordrlist[i].HRemark;
                            barcode.HDate2 = ordrlist[i].HDate;
                            barcode.HShowDate2 = ordrlist[i].HShowDate;
                            barcode.HWhID2 = ordrlist[i].HWhID;
                            barcode.HWhNumber2 = ordrlist[i].HWhNumber;
                            barcode.HWhName2 = ordrlist[i].HWhName;
                            barcode.HSPID2 = ordrlist[i].HSPID;
                            barcode.HSPNumber2 = ordrlist[i].HSPNumber;
                            barcode.HSPName2 = ordrlist[i].HSPName;
                            barcode.HMTONo2 = ordrlist[i].HMTONo;
                            barcode.HCusID2 = ordrlist[i].HCusID;
                            barcode.HCusNumber2 = ordrlist[i].HCusNumber;
                            barcode.HCusName2 = ordrlist[i].HCusName;
                            barcode.HCusType2 = ordrlist[i].HCusType;
                            barcode.HSourceID2 = ordrlist[i].HSourceID;
                            barcode.HSourceNumber2 = ordrlist[i].HSourceNumber;
                            barcode.HSourceName2 = ordrlist[i].HSourceName;
                            barcode.HEndDate2 = ordrlist[i].HEndDate;
                            barcode.HSeOrderBillNo2 = ordrlist[i].HSeOrderBillNo;
                            barcode.HInnerBillNo2 = ordrlist[i].HInnerBillNo;
                            barcode.HMaker2 = ordrlist[i].HMaker;
                            barcode.HGiveAwayFlag2 = ordrlist[i].HGiveAwayFlag;
                            barcode.HCoilNO = ordrlist[i].HCoilNO;
                            barcode.HFurnaceNO = ordrlist[i].HFurnaceNO;
                            barcode.HFactory = ordrlist[i].HFactory;
                            barcode.HAuxQty = ordrlist[i].HAuxQty;
                            barcode.HheatNO = ordrlist[i].HheatNO;
                            barcode.HGroupID2 = ordrlist[i].HGroupID;
                            barcode.HEmpID2 = ordrlist[i].HEmpID;
                            barcode.HCusModel2 = ordrlist[i].HCusModel;
                            barcode.HCusMaterName2 = ordrlist[i].HCusMaterName;
                            barcode.HCheckEmpName2 = ordrlist[i].HCheckEmpName;
                            barcode.HReInspectionFlag = ordrlist[i].HReInspectionFlag ? 1 : 0;
                            barcode.HInspectionDate = ordrlist[i].HReInspectionFlag? ordrlist[i].HInspectionDate:null;
                            barcode.HInspectionCycle = ordrlist[i].HReInspectionFlag ? ordrlist[i].HInspectionCycle : 0;
                            barcode.HReInspectionDate = ordrlist[i].HReInspectionFlag ? ordrlist[i].HReInspectionDate : null;
                            barcode.HSeOrderBillNo2 = DBUtility.ClsPub.isStrNull(ordrlist[i].HPOOrderBillMTO);
                            ListRows.Add(barcode);
                            n += 1;                                                             //更新同批生成的条码数
                            oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");           //更新最大流水号
                        }
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "错误的条码类型,不能生成条码!";
                        return objJsonResult;
                    }
                }
            }
            try
            {
                oCN.BeginTran();
                for (int i = 0; i < ListRows.Count; i++)
                {
                    if (ClsPub.isLong(ListRows[i].HMaterID2) != 0)
                    {
                        string HBarCode = ClsPub.isStrNull(ListRows[i].HBarCode2);
                        string HBarCodeType = ClsPub.isStrNull(ListRows[i].HBarCodeType2);
                        string HBarCodeSubType = ClsPub.isStrNull(ListRows[i].HBarCodeSubType2);
                        Int64 HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
                        Int64 HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
                        Int64 HAuxPropID = ClsPub.isLong(ListRows[i].HAuxPropID2);
                        Int64 HUnitID = ClsPub.isLong(ListRows[i].HUnitID2);
                        double HQty2 = ClsPub.isDoule(ListRows[i].HQty2);
                        string HWei = ClsPub.isStrNull(ListRows[i].HWei);
                        string HBatchNo2 = ClsPub.isStrNull(ListRows[i].HBatchNo2);
                        Int64 HSourceInterID = ClsPub.isLong(ListRows[i].HSourceInterID2);
                        Int64 HSourceEntryID = ClsPub.isLong(ListRows[i].HSourceEntryID2);
                        string HSourceBillNo = ClsPub.isStrNull(ListRows[i].HSourceBillNo2);
                        string HSourceBillType = ClsPub.isStrNull(ListRows[i].HSourceBillType2);
                        Int64 HBarcodeQtys = ClsPub.isLong(ListRows[i].HBarcodeQtys);
                        Int64 HBarcodeNo = ClsPub.isLong(ListRows[i].HBarcodeNo);
                        Int64 HSupID = ClsPub.isLong(ListRows[i].HSupID2);
                        Int64 HDeptID = ClsPub.isLong(ListRows[i].HDeptID2);
                        Int64 HWhID = ClsPub.isLong(ListRows[i].HWhID2);
                        Int64 HSPID = ClsPub.isLong(ListRows[i].HSPID2);
                        string HRemark = ClsPub.isStrNull(ListRows[i].HRemark2);
                        string HMaterName = ClsPub.isStrNull(ListRows[i].HMaterName2);
                        string HMaterModel = ClsPub.isStrNull(ListRows[i].HMaterModel2);
                        string HPinfan = ClsPub.isStrNull(ListRows[i].HPinfan2);
                        string HMTONo = ClsPub.isStrNull(ListRows[i].HMTONo2);
                        Int64 HCusID = ClsPub.isLong(ListRows[i].HCusID2);
                        string HCusType = ClsPub.isStrNull(ListRows[i].HCusType2);
                        DateTime HEndDate = ClsPub.isDate(ListRows[i].HEndDate2);
                        string HWorkLineName = ClsPub.isStrNull(ListRows[i].HSourceName2);
                        string HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
                        string HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
                        bool HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
                        int HPrintQty = ClsPub.isInt(ListRows[i].HPrint);
                        string HCoilNO2 = ClsPub.isStrNull(ListRows[i].HCoilNO);
                        string HFurnaceNO2 = ClsPub.isStrNull(ListRows[i].HFurnaceNO);
                        string HFactory2 = ClsPub.isStrNull(ListRows[i].HFactory);
                        Int64 HAuxQty2 = ClsPub.isLong(ListRows[i].HAuxQty);
                        string HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
                        DateTime HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
                        DateTime HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
                        int HGroupID2 = ClsPub.isInt(ListRows[i].HGroupID2);
                        Int64 HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
                        string HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
                        string HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
                        string HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
                        int HReInspectionFlag = ClsPub.isInt(ListRows[i].HReInspectionFlag);
                        string HInspectionDate = ListRows[i].HInspectionDate;
                        int HInspectionCycle = ClsPub.isInt(ListRows[i].HInspectionCycle);
                        string HReInspectionDate = ListRows[i].HInspectionDate;
                        string HCustomBatchNo = ClsPub.isStrNull(ListRows[i].HInspectionDate).Replace("-","");
                        string HBarCodeStatus = "正常";
                        string sql_produceBarCode = "insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
                                    ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
                                    ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
                                    ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
                                    ",HGiveAwayFlag " +
                                    ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                                    ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HCustomBatchNo,HBarCodeStatus" +
                                    ",HReInspectionFlag,HInspectionDate,HInspectionCycle,HReInspectionDate " +
                                    ") values ("
                                    + "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
                                    + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
                                    + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
                                    + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
                                    + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
                                    + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
                                    + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
                                    + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HCustomBatchNo + "','" + HBarCodeStatus + "'" +
                                    "," + HReInspectionFlag + "," + (HInspectionDate == null ? "null" : "'" + HInspectionDate + "'") + "," + HInspectionCycle + "," + (HReInspectionDate == null ? "null" : "'" + HReInspectionDate + "'") +
                                    ")";
                        oCN.RunProc(sql_produceBarCode);
                    }
                }
                oCN.Commit();
                List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List实体类转换为object
                //获取生成的条码信息
                string sql = string.Format(@"select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID");
                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_IF_ICMOBillList_Table");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "[0000-1-037]获取资源绑定数据成功!";
                    objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //序列化DataSet中的时间格式,然后再反序列化回来
                    objJsonResult.list = listobj;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-2-020]没有返回任何结果,条码不存在!";
                    objJsonResult.data = null;
                    objJsonResult.list = listobj;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[3899-2-006]条码生成失败!" + e.Message;
                return objJsonResult;
            }
        }
        #endregion
        #region [app æ¡ç æ‹†ç èŽ·å–å­æ¡ç ]
        [Route("Sc_BarCode/SplitBarCode_Sub")]
        [HttpGet]
@@ -2818,35 +3319,35 @@
        {
            try
            {
                if(oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", "admin", ref DBUtility.ClsPub.sErrInfo)==false)
                //if(oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", "admin", ref DBUtility.ClsPub.sErrInfo)==false)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "[0000-2-020]单据同步失败请联系管理员,"+ DBUtility.ClsPub.sErrInfo;
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                ds = oCN.RunProcReturn("exec h_p_WMS_SaveSNByICMO_XW '" + @HBillNo + "','" + HSN +"',"+HBeginNo+","+HEndNo+","+HCount+",'"+HMachineCode+"'", "h_p_WMS_SaveSNByICMO_XW");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-2-020]单据同步失败请联系管理员,"+ DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = "[0000-2-020]没有返回任何结果,条码保存失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    ds = oCN.RunProcReturn("exec h_p_WMS_SaveSNByICMO_XW '" + @HBillNo + "', " + HSN +","+HBeginNo+","+HEndNo+","+HCount+",'"+HMachineCode+"'", "h_p_WMS_SaveSNByICMO_XW");
                    if (ds == null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "[0000-2-020]没有返回任何结果,条码保存失败!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "[0000-2-020]条码绑定失败!"+ ds.Tables[0].Rows[0]["HRemark"].ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-2-020]条码绑定失败!"+ ds.Tables[0].Rows[0]["HRemark"].ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //}
@@ -2944,6 +3445,7 @@
            List<HBarCodeList> ListRows = new List<HBarCodeList>();
            DataSet Ds;
            DataSet Ds2;
            for (int i = 0; i < 1; i++)
            {
                HSourceBillType_Temp = ordrlist.HBillType;
@@ -2970,7 +3472,13 @@
                            string HMaterialName = DBUtility.ClsPub.isStrNull(ordrlist.HMaterName);
                            string HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist.HSupNumber).Replace(".", "");             //供应商代码(去掉分隔符)
                            int lastDigit = int.Parse(DateTime.Today.Year.ToString().Last().ToString());
                            char productionMonth = DateTime.Today.Month <= 9
                            int currentMonth = DateTime.Now.Month;
                            char[] monthToLetter = {
                            'N', 'P', 'Q', 'R', 'S', 'T',
                            'U', 'V', 'W', 'X', 'Y', 'Z'
                                                };
                            char productionMonth = monthToLetter[currentMonth - 1];
                            char productionDay = DateTime.Today.Month <= 9
                            ? (char)(DateTime.Today.Month + '0')
                            : (char)('A' + DateTime.Today.Month - 10);
                            if (HMaterialName.Trim() == "")
@@ -2980,16 +3488,32 @@
                                objJsonResult.Message = "物料不能为空,不能生成条码!";
                                return objJsonResult;
                            }
                            Ds2 = oCN.RunProcReturn("select top 1 HCusRelationNumber from Gy_Material m with(nolock) left join Gy_MateNumRelation_Sec b with(nolock) on m.HMASTERID = b.HMaterID where m.HItemID = " + ordrlist.HMaterID, "Gy_MateNumRelation_Sec");
                            string HSKU = "";//商品SKU
                            if (Ds2.Tables[0].Rows.Count > 0)
                            {
                                HSKU = Ds2.Tables[0].Rows[0]["HCusRelationNumber"].ToString();
                            }
                            else
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "没有匹配到对应的商品SKU!";
                                return objJsonResult;
                            }
                            //todo
                            //条码前缀 = p+商品SKU+生产年份+生产月份+6位流水号+生产工厂代码
                            sTMNumber = "P" + HMaterialName + lastDigit+ productionMonth;
                            sTMNumber = "P" + HSKU + lastDigit+ productionMonth;
                            //根据条码前缀获取最大流水号
                            Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
                            LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
                            //拼接条码
                            HBarCode_Temp = sTMNumber + LSH+"XXX";
                            HBarCode_Temp = sTMNumber + "A" + LSH + "AHW";
                            if (HSumQty - HMinQty > 0)