llj
2025-11-11 39f20d0d2e0143e45fb317336f154170d6b82485
小卫托条码生成
3个文件已修改
614 ■■■■ 已修改文件
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 171 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs 345 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/条码管理/WEBSController.cs 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -4377,11 +4377,11 @@
                if (!tb2.Columns.Contains("状态"))
                    error += "没有找到【状态】的标题,";
                if (!tb2.Columns.Contains("默认仓库"))
                    error += "没有找到【默认仓库】的标题,";
                //if (!tb2.Columns.Contains("默认仓库"))
                //    error += "没有找到【默认仓库】的标题,";
                if (!tb2.Columns.Contains("默认仓位"))
                    error += "没有找到【默认仓位】的标题,";
                //if (!tb2.Columns.Contains("默认仓位"))
                //    error += "没有找到【默认仓位】的标题,";
                if (!tb2.Columns.Contains("版本号"))
                    error += "没有找到【版本号】的标题,";
@@ -4442,8 +4442,8 @@
                    HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["对应ERP物料"].ToString());
                    HUnitName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["计量单位"].ToString());
                    HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["使用部门"].ToString());
                    HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓库"].ToString());
                    HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓位"].ToString());
                        HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓库"].ToString());
                        HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["默认仓位"].ToString());
                    HSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商"].ToString());
                    HSupNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["供应商代码"].ToString());
                    HMadeSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["制造商"].ToString());
@@ -4534,67 +4534,83 @@
                        {
                            tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        //查询仓库
                        ds = oCN.RunProcReturn("select * from Gy_Warehouse where  HName='" + HWHName + "'  and HUSEORGID=" + HORGid + "", "Gy_Warehouse");
                        if (HWHName != "")
                        {
                            //查询仓库
                            ds = oCN.RunProcReturn("select * from Gy_Warehouse where  HName='" + HWHName + "'  and HUSEORGID=" + HORGid + "", "Gy_Warehouse");
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,仓库:" + HWHName + ",不存在!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HSPGroupID"].ToString();
                        }
                        string HWHID = tb2.Rows[i]["HWHID"].ToString();
                        //查询仓位
                        ds = oCN.RunProcReturn("select * from Gy_StockPlace where  HName='" + HSPName + "'and HSPGroupID=" + HWHID+ "  and HUSEORGID=" + HORGid + "", "Gy_StockPlace");
                            if (ds.Tables[0].Rows.Count == 0)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,仓库:" + HWHName + ",不存在!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            else
                            {
                                tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                            }
                            string HWHID = tb2.Rows[i]["HWHID"].ToString();
                            if (HWHID != "")
                            {
                                //查询仓位
                                ds = oCN.RunProcReturn("select * from Gy_StockPlace where  HName='" + HSPName + "'and HSPGroupID=" + HWHID + "  and HUSEORGID=" + HORGid + "", "Gy_StockPlace");
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,仓位:" + HSPName + ",不存在!";
                            objJsonResult.data = null;
                            return objJsonResult;
                                if (ds.Tables[0].Rows.Count == 0)
                                {
                                    objJsonResult.code = "0";
                                    objJsonResult.count = 0;
                                    objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,仓位:" + HSPName + ",不存在!";
                                    objJsonResult.data = null;
                                    return objJsonResult;
                                }
                                else
                                {
                                    tb2.Rows[i]["HSPID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                                }
                            }
                        }
                        else
                       if(HSupName!="")
                        {
                            tb2.Rows[i]["HSPID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                            ds = oCN.RunProcReturn("select * from Gy_Supplier where  HNumber='" + HSupNumber + "'  and HUSEORGID=" + HORGid + "", "Gy_Supplier");
                            if (ds.Tables[0].Rows.Count == 0)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,供应商:" + HSupName + ",不存在!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            else
                            {
                                tb2.Rows[i]["HSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                            }
                        }
                        //查询供应商
                        ds = oCN.RunProcReturn("select * from Gy_Supplier where  HNumber='" + HSupNumber + "'  and HUSEORGID=" + HORGid + "", "Gy_Supplier");
                       if(HMadeSupName!="")
                        {
                            //查询制造商
                            ds = oCN.RunProcReturn("select * from Gy_Supplier where  HName='" + HMadeSupName + "'  and HUSEORGID=" + HORGid + "", "Gy_Supplier");
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,供应商:" + HSupName + ",不存在!";
                            objJsonResult.data = null;
                            return objJsonResult;
                            if (ds.Tables[0].Rows.Count == 0)
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,制造商:" + HMadeSupName + ",不存在!";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            else
                            {
                                tb2.Rows[i]["HMadeSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                            }
                        }
                        else
                        {
                            tb2.Rows[i]["HSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        //查询制造商
                        ds = oCN.RunProcReturn("select * from Gy_Supplier where  HName='" + HMadeSupName + "'  and HUSEORGID=" + HORGid + "", "Gy_Supplier");
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "第" + index + "行,该" + HORGName + "组织,制造商:" + HMadeSupName + ",不存在!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            tb2.Rows[i]["HMadeSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
                        }
                        //器具档案名称
                        if (HMouldName == "")
@@ -4704,15 +4720,19 @@
                    long HUnitID = int.Parse(item["HUnitID"].ToString());
                    DateTime HOutComDate = DateTime.Now;
                    string HOutComNo = item["器具出厂编号"].ToString();
                    long HDeptID = int.Parse(item["HDeptID"].ToString());
                    long HSupID = int.Parse(item["HSupID"].ToString());
                    var HDeptID_temp = item["HDeptID"].ToString() == "" ? "0" : item["HDeptID"].ToString();
                    long HDeptID = int.Parse(HDeptID_temp);
                    var HSupID_temp = item["HSupID"].ToString() == "" ? "0" : item["HSupID"].ToString();
                    long HSupID = int.Parse(HSupID_temp);
                    string HMouldStatus = item["状态"].ToString();
                    long HWHID = int.Parse(item["HWHID"].ToString());
                    var HWHID_TEMP = item["HWHID"].ToString() == "" ? "0" : item["HWHID"].ToString();
                    long HWHID = int.Parse(HWHID_TEMP);
                    long HRoutingID = 0;//工艺路线id
                    long HBOMID = 0;
                    string HVersion = "";//版本
                    long HSPGroupID = 0;//默认仓位组
                    long HSPID = int.Parse(item["HSPID"].ToString());//仓位id
                    var HSPID_temp = item["HSPID"].ToString() == "" ? "0" : item["HSPID"].ToString();
                    long HSPID = int.Parse(HSPID_temp);//仓位id
                    Double HDesignLife = item["设计寿命"].ToString()=="" ? 0: double.Parse(item["设计寿命"].ToString());
                    Double HUseLife = item["使用寿命"].ToString() == "" ? 0 : double.Parse(item["使用寿命"].ToString());
                    Double HInitLife = 0;//上线初始化寿命
@@ -4855,5 +4875,30 @@
        #endregion
        #endregion
        //根据条码找物料信息
        [Route("Gy_Material/findMaterialByNumber")]
        [HttpGet]
        public object findMaterialByNumber(string HbarCode,string HSTOCKORGID)
        {
            try
            {
                ds = oCN.RunProcReturn($"select * from Gy_BarCodeBill where HBarCode='{HbarCode}' ", "Gy_Material");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "初始化失败!";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
    }
}
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs
@@ -2807,6 +2807,351 @@
        }
        #endregion        
        #region [条码生成接口_小卫托条码]
        [Route("Sc_BarCode/Sub_SaveBill_xiaowei")]
        [HttpPost]
        public object Sub_SaveBill_xiaowei([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 = "生产订单";//源单类型
                string HSelectBarCodeType = "托盘条码";
                string CampanyName = "小卫";
                string UserName = sArray[2].ToString();//用户
                ClsPub.CurUserName = UserName;
                //获取内码
                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;
                //}
                if (HSelectBarCodeType == "仪器成品条码规则")
                {
                    //客户定制
                }
                else
                {
                    //生成条码
                    SaveBarCode_xiaowei(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[条码生成方法_xiaowei]
        private object SaveBarCode_xiaowei(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
            HSouceOrderList ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<HSouceOrderList>(msg2);
           // List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
            List<HBarCodeList> ListRows = new List<HBarCodeList>();
            DataSet Ds;
            for (int i = 0; i < 1; i++)
            {
                HSourceBillType_Temp = ordrlist.HBillType;
                if (ClsPub.isLong(ordrlist.HMaterID) != 0)
                {
                    if (HSelectBarCodeType == "托盘条码")
                    {
                        //拆分每条物料记录为多条条码记录
                        double HSumQty = ClsPub.isDoule(ordrlist.HQty);                      //产品数量
                        double HQty = ClsPub.isDoule(ordrlist.HQty);                         //数量
                        double HMinQty = ClsPub.isDoule(ordrlist.HMinQty);                   //最小包装数
                        int HBQty = ClsPub.isInt(ordrlist.HBQty);                            //箱数
                        string WeiShu = "";                                                     //尾数
                        for (int j = 0; j < HBQty; j++)
                        {
                            string HBarCode_Temp = "";                                                  //条码
                            string sTMNumber = "";                                                      //条码前缀
                            string LSH = "";                                                            //最大流水号
                            int HLen = 6;                                                            //流水号长度
                            //条码拼接所需字段
                            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
                            ? (char)(DateTime.Today.Month + '0')
                            : (char)('A' + DateTime.Today.Month - 10);
                            if (HMaterialName.Trim() == "")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "物料不能为空,不能生成条码!";
                                return objJsonResult;
                            }
                            //todo
                            //条码前缀 = p+商品SKU+生产年份+生产月份+6位流水号+生产工厂代码
                            sTMNumber = "P" + HMaterialName + 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";
                            if (HSumQty - HMinQty > 0)
                            {
                                WeiShu = "";
                                HSumQty = HSumQty - HMinQty;
                            }
                            else
                            {
                                if (HSumQty == HMinQty)
                                {
                                    WeiShu = "";
                                }
                                else
                                {
                                    WeiShu = "尾数";
                                }
                                HMinQty = HSumQty;
                            }
                            HBarCodeList barcode = new HBarCodeList();
                            barcode.HBarCode2 = HBarCode_Temp;
                            barcode.HBarCodeType2 = "托盘条码";
                            barcode.HBarCodeSubType2 = "托条码";
                            barcode.HEntryID2 = ClsPub.isStrNull(i + 1);
                            barcode.HMaterID2 = ordrlist.HMaterID;
                            barcode.HMaterNumber2 = ordrlist.HMaterNumber;
                            barcode.HMaterName2 = ordrlist.HMaterName;
                            barcode.HMaterModel2 = ordrlist.HMaterModel;
                            barcode.HPinfan2 = ordrlist.HPinfan;
                            barcode.HPinfanBarCode2 = ordrlist.HPinfanBarCode;
                            barcode.HAuxPropID2 = ordrlist.HAuxPropID;
                            barcode.HAuxPropNumber2 = ordrlist.HAuxPropNumber;
                            barcode.HAuxPropName2 = ordrlist.HAuxPropName;
                            barcode.HUnitID2 = ordrlist.HUnitID;
                            barcode.HUnitNumber2 = ordrlist.HUnitNumber;
                            barcode.HUnitName2 = ordrlist.HUnitName;
                            barcode.HQty2 = ClsPub.isStrNull(HMinQty);
                            barcode.HBatchNo2 = ordrlist.HBatchNo;
                            barcode.HSourceInterID2 = ordrlist.HMainID;
                            barcode.HSourceEntryID2 = ordrlist.HSubID;
                            barcode.HSourceBillNo2 = ordrlist.HBillNo;
                            barcode.HSourceBillType2 = ordrlist.HBillType;
                            barcode.HPrint = "0";
                            barcode.HWei = WeiShu;
                            barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
                            barcode.HBarcodeQtys = ordrlist.HBQty;
                            barcode.HSupID2 = ordrlist.HSupID;
                            barcode.HSupNumber2 = ordrlist.HSupNumber;
                            barcode.HSupName2 = ordrlist.HSupName;
                            barcode.HDeptID2 = ordrlist.HDeptID;
                            barcode.HDeptNumber2 = ordrlist.HDeptNumber;
                            barcode.HDeptName2 = ordrlist.HDeptName;
                            barcode.HRemark2 = ordrlist.HRemark;
                            barcode.HDate2 = ordrlist.HDate;
                            barcode.HShowDate2 = ordrlist.HShowDate;
                            barcode.HWhID2 = ordrlist.HWhID;
                            barcode.HWhNumber2 = ordrlist.HWhNumber;
                            barcode.HWhName2 = ordrlist.HWhName;
                            barcode.HSPID2 = ordrlist.HSPID;
                            barcode.HSPNumber2 = ordrlist.HSPNumber;
                            barcode.HSPName2 = ordrlist.HSPName;
                            barcode.HMTONo2 = ordrlist.HMTONo;
                            barcode.HCusID2 = ordrlist.HCusID;
                            barcode.HCusNumber2 = ordrlist.HCusNumber;
                            barcode.HCusName2 = ordrlist.HCusName;
                            barcode.HCusType2 = ordrlist.HCusType;
                            barcode.HSourceID2 = ordrlist.HSourceID;
                            barcode.HSourceNumber2 = ordrlist.HSourceNumber;
                            barcode.HSourceName2 = ordrlist.HSourceName;
                            barcode.HEndDate2 = ordrlist.HEndDate;
                            barcode.HSeOrderBillNo2 = ordrlist.HSeOrderBillNo;
                            barcode.HInnerBillNo2 = ordrlist.HInnerBillNo;
                            barcode.HMaker2 = ordrlist.HMaker;
                            barcode.HGiveAwayFlag2 = ordrlist.HGiveAwayFlag;
                            barcode.HCoilNO = ordrlist.HCoilNO;
                            barcode.HFurnaceNO = ordrlist.HFurnaceNO;
                            barcode.HFactory = ordrlist.HFactory;
                            barcode.HAuxQty = ordrlist.HAuxQty;
                            barcode.HheatNO = ordrlist.HheatNO;
                            barcode.HGroupID2 = ordrlist.HGroupID;
                            barcode.HEmpID2 = ordrlist.HEmpID;
                            barcode.HCusModel2 = ordrlist.HCusModel;
                            barcode.HCusMaterName2 = ordrlist.HCusMaterName;
                            barcode.HCheckEmpName2 = ordrlist.HCheckEmpName;
                            barcode.HZZRQ = ordrlist.HZZRQ;
                            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);
                        string HZZRQ = ClsPub.isStrNull(ListRows[i].HZZRQ);
                        oCN.RunProc("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,HZZRQ " +
                                    ") 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 + "','" + HZZRQ + "'" + ")");
                    }
                }
                //增加 æ¡ç è¶…过未生成功能控制
                //
                //自动装箱
                string sql_autoForBoxBill = "exec h_v_Gy_BarCode_AutoProductBarCodeBox " + HInterID.ToString();
                oCN.RunProc(sql_autoForBoxBill);
                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
        #endregion
    }
}
WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -4694,6 +4694,33 @@
        #endregion
        #region å°å«ç»„托条码展示
        [Route("WEBSController/get_SavePackUnion_xiaowei")]
        [HttpGet]
        public object get_SavePackUnion_xiaowei(string HBarCode_Pack)
        {
            try
            {
                DataSet ds=oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where æ ˆæ¿ç ='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "success";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败!
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ä¸Šæ–™é˜²é”™å•     ä¸Šä¼ ç”Ÿå•
        /// <summary>
@@ -7920,6 +7947,77 @@
        #endregion
        #region ç”Ÿäº§ç»„托单模块 æ‰«ææ‰˜æ¡ç å¯¹åº”条码--xiaowei    20250630
        /// <summary>
        /// ç”Ÿäº§ç»„托单模块 æ‰«ææ‰˜æ¡ç å¯¹åº”条码
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei")]
        [HttpGet]
        public object get_BarCode_PackUnionBill_New_Json_xiaowei(string HBarCode, Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HMaterNumber_Pack, string HMaker, Int64 HStockOrgID)
        {
            //获取系统参数
            string sErrMsg = "";
            if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
            {
                string sMaterialCtl = "Y";          //组托物料是否一致控制(Y为控制)
                string sSourceBillTypeCtl = "Y";    //未入库条码进行组托时,进行同源单类型控制(Y为控制)
                string sSourceBillNoCtl = "Y";      //未入库条码进行组托时,进行同源单控制(Y为控制)
                sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
                sSourceBillTypeCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillTypeCtl.ToUpper();
                sSourceBillNoCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillNoCtl.ToUpper();
                try
                {
                    ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New_xiaowei '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "扫描条码发生错误!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "成功!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                catch (Exception e)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫描条码失败!" + e.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取系统参数失败! " + sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è¿”回组托列表信息
        /// <summary>