1
duhe
3 天以前 c54d0f376d4513f812794646569dd6ca8174f9d9
1
96个文件已修改
16个文件已添加
2126 ■■■■ 已修改文件
BLL/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/ClsWL_YayBillMain.cs 389 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/DAL.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/bin/Release/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_BillType.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/物流管理/ClsWL_YayBillMainBillMain.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/物流管理/ClsWL_YayBillMainBillSub.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/bin/Release/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/bin/Release/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/bin/Release/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Control/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Control/bin/Release/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Control/bin/Release/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Control/bin/Release/Pub_Control.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/bin/Release/Pub_Class.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/bin/Release/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/bin/Release/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/obj/Release/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/obj/Release/SQLHelper.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/bin/Debug/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/bin/Debug/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/bin/Release/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/bin/Release/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Gy_BarCodeBillList.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/QC_InStockCheckBillController.cs 384 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_ProcessMangementController.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/条码管理/WEBSController.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/物流管理/出运单/WLYayBillController.cs 551 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsGy_Material_Ctl.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 176 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user 128 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Utility/Barcode.ashx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Release/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/BLL.dll
Binary files differ
BLL/bin/Release/BLL.pdb
Binary files differ
BLL/bin/Release/DAL.dll
Binary files differ
BLL/bin/Release/DAL.pdb
Binary files differ
BLL/bin/Release/DBUtility.dll
Binary files differ
BLL/bin/Release/DBUtility.pdb
Binary files differ
BLL/bin/Release/Model.dll
Binary files differ
BLL/bin/Release/Model.pdb
Binary files differ
BLL/bin/Release/Pub_Class.dll
Binary files differ
BLL/bin/Release/Pub_Class.pdb
Binary files differ
BLL/bin/Release/Pub_Control.dll
Binary files differ
BLL/bin/Release/Pub_Control.pdb
Binary files differ
BLL/bin/Release/SQLHelper.dll
Binary files differ
BLL/bin/Release/SQLHelper.pdb
Binary files differ
DAL/ClsWL_YayBillMain.cs
New file
@@ -0,0 +1,389 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;
namespace DAL
{
    public class ClsWL_YayBillMain : DBUtility.ClsXt_BaseBill
    {
        public Model.ClsWL_YayBillMainBillMain omodel = new Model.ClsWL_YayBillMainBillMain();
        public List<Model.ClsWL_YayBillMainBillSub> DetailColl = new List<Model.ClsWL_YayBillMainBillSub>();
        string SafeString(string value, string defaultValue = "") =>
                   string.IsNullOrEmpty(value) ? defaultValue : value;
        // è¾…助方法:安全转换为整数,处理null、空字符串和非数字
        int SafeInt(string value, int defaultValue = 0) =>
            int.TryParse(value, out int result) ? result : defaultValue;
        // è¾…助方法:安全转换为小数
        decimal SafeDecimal(string value, decimal defaultValue = 0) =>
            decimal.TryParse(value, out decimal result) ? result : defaultValue;
        // è¾…助方法:安全转换为日期
        string SafeDateTime(string dateStr, string defaultValue)
        {
            if (string.IsNullOrEmpty(dateStr) || dateStr == "\"\"")
                return defaultValue;
            if (DateTime.TryParse(dateStr, out DateTime result) && result != DateTime.MinValue)
                return "'" + result.ToString("yyyy-MM-dd HH:mm:ss") + "'";
            return defaultValue;
        }
        public ClsWL_YayBillMain()
        {
            base.MvarItemKeySub = "WL_YayBillMain";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "WL_YayBillMain";
            base.MvarReportTitle = "出运单";
            base.BillType = "3321";
            base.HBillSubType = "3321";
        }
        #region å›ºå®šä»£ç 
        ~ClsWL_YayBillMain()
        {
            DetailColl = null;
        }
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败!";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败!" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================
                //更新主表
                oCn.RunProc("UpDate WL_YayBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                ",HChecker='" + omodel.HChecker.ToString()+ "'" +
                ",HMainSourceBillType='" + omodel.HMainSourceBillType + "'" +
                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
                ",HMainSourceInterID='" + omodel.HMainSourceInterID.ToString() + "'" +
                ",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +
                ",HCusID='" + omodel.HCusID.ToString() + "'" +
                ",HBeginAddr='" + omodel.HBeginAddr.ToString() + "'" +
                ",HEndAddr='" + omodel.HEndAddr.ToString() + "'" +
                ",HPickAddr='" + omodel.HPickAddr.ToString() + "'" +
                ",HArriverAddr='" + omodel.HArriverAddr.ToString() + "'" +
                ",HTransType='" + omodel.HTransType.ToString() + "'" +
                ",HCarTypeID='" + omodel.HCarTypeID.ToString() + "'" +
                ",HCarTypeMaxVolume='" + omodel.HCarTypeMaxVolume.ToString() + "'" +
                ",HTotalVolume='" + omodel.HTotalVolume.ToString() + "'" +
                ",HLoadingRate='" + omodel.HLoadingRate.ToString() + "'" +
                ",HContractTransportInterID='" + omodel.HContractTransportInterID.ToString() + "'" +
                ",HContractTransportEntryID='" + omodel.HContractTransportEntryID.ToString() + "'" +
                ",HContractTransportBillNo='" + omodel.HContractTransportBillNo.ToString() + "'" +
                ",HCarrierID='" + omodel.HCarrierID.ToString() + "'" +
                ",HDistance='" + omodel.HDistance.ToString() + "'" +
                ",HTransportTimes='" + omodel.HTransportTimes.ToString() + "'" +
                ",HTransportTyep='" + omodel.HTransportTyep.ToString() + "'" +
                ",HSSID='" + omodel.HSSID.ToString() + "'" +
                ",HCurID='" + omodel.HCurID.ToString() + "'" +
                ",HMoney='" + omodel.HMoney.ToString() + "'" +
                ",HDateForRequestedPick='" + omodel.HDateForRequestedPick.ToString() + "'" +
                ",HDataForRequestedArrived='" + omodel.HDataForRequestedArrived.ToString() + "'" +
                ",HCarryStatus='" + omodel.HCarryStatus.ToString() + "'" +
                ",HDate_CarrierSure='" + omodel.HDate_CarrierSure.ToString() + "'" +
                ",HDate_AllocationDriver='" + omodel.HDate_AllocationDriver.ToString() + "'" +
                ",HCarID='" + omodel.HCarID.ToString() + "'" +
                ",HDriverID='" + omodel.HDriverID.ToString() + "'" +
                ",HSurer_Arrive='" + omodel.HSurer_Arrive.ToString() + "'" +
                ",HDate_Arrive='" + omodel.HDate_Arrive.ToString() + "'" +
                ",HSurer_Pick='" + omodel.HSurer_Pick.ToString() + "'" +
                ",HDate_Pick='" + omodel.HDate_Pick.ToString() + "'" +
                ",HSurer_Trans='" + omodel.HSurer_Trans.ToString() + "'" +
                ",HDate_Trans='" + omodel.HDate_Trans.ToString() + "'" +
                ",HSurer_Receive='" + omodel.HSurer_Receive.ToString() + "'" +
                ",HDate_Receive='" + omodel.HDate_Receive.ToString() + "'" +
                ",HSurer_Accounting='" + omodel.HSurer_Accounting.ToString() + "'" +
                ",HDate_Accounting='" + omodel.HDate_Accounting.ToString() + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                oCn.RunProc("delete from WL_YayBillSub_Material where HInterID=" + lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                string sql = "";
                foreach (Model.ClsWL_YayBillMainBillSub oSub in DetailColl)
                {
                    sql = "Insert into WL_YayBillSub_Material " +
               "(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
               ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
               ",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
               ",HMouldFoldHeight,HVolume,HQty,HSNP,HMouldQty) values("
               + SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
               + SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
               + (oSub.HEntryID) + ",'" // HEntryID int
               + SafeString(oSub.HCloseMan?.ToString()) + "','" // HCloseMan varchar(20)
               + (oSub.HEntryCloseDate == null ? DateTime.Now : oSub.HEntryCloseDate) + "'," // HEntryCloseDate datetime
               + (oSub.HCloseType ? "1" : "0") + ",'" // HCloseType bit
               + SafeString(oSub.HRemark?.ToString() ?? "") + "'," // HRemark varchar(200)
               + (oSub.HSourceInterID == null ? 0 : oSub.HSourceInterID) + "," // HSourceInterID int
               + (oSub.HSourceEntryID == null ? 0 : oSub.HSourceEntryID) + ",'" // HSourceEntryID int
               + SafeString(oSub.HSourceBillNo?.ToString(), "") + "','" // HSourceBillNo varchar(50)
               + SafeString(oSub.HSourceBillType?.ToString(), "") + "'," // HSourceBillType varchar(10)
               + (oSub.HRelationQty == null ? 0 : oSub.HRelationQty) + "," // HRelationQty dec(18,8)
               + (oSub.HRelationMoney) + "," // HRelationMoney dec(18,8)
               + (oSub.HMaterID) + "," // HMaterID int
               + (oSub.HUnitID.ToString() == "" ? 0 : oSub.HUnitID) + "," // HUnitID int
               + (oSub.HMouldID) + "," // HMouldID int
               + (oSub.HMouldLength.ToString() == "" ? 0 : oSub.HMouldLength) + "," // HMouldLength dec(18,8)
               + (oSub.HMouldHeight.ToString() == "" ? 0 : oSub.HMouldHeight) + "," // HMouldHeight dec(18,8)
               + (oSub.HMouldWidth.ToString() == "" ? 0 : oSub.HMouldWidth) + "," // HMouldWidth dec(18,8)
               + (oSub.HMouldFoldHeight.ToString() == "" ? 0 : oSub.HMouldFoldHeight) + "," // HMouldFoldHeight dec(18,8)
               + (oSub.HVolume.ToString() == "" ? 0 : oSub.HVolume) + "," // HVolume dec(18,8)
               + (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
               + (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
               + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
                    oCn.RunProc(sql);
                }
                //=========================保存后控制
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败!";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2!" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================
                sReturn = "修改单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
                if (ds == null)
                {
                    sReturn = "保存前判断失败!";
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败!" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    return false;
                }
                //=========================================================
                oCn.BeginTran();
                // èŽ·å–å½“å‰æ—¥æœŸæ—¶é—´ï¼Œç”¨äºŽç©ºæ—¥æœŸå­—æ®µçš„é»˜è®¤å€¼
                // èŽ·å–å½“å‰æ—¥æœŸæ—¶é—´
                string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                // è¾…助方法:安全转换为字符串,处理null和空字符串
                string sql = "Insert Into WL_YayBillMain " +
                           "(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus," +
                           "HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HRemark,HBacker,HBackDate," +
                           "HBackRemark,HChecker,HCheckDate,HMaker,HMakeDate,HUpDater,HUpDateDate," +
                           "HCloseMan,HCloseDate,HCloseType,HDeleteMan,HDeleteDate," +
                           "HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
                           "HPrintQty,HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr," +
                           "HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
                           "HLoadingRate,HContractTransportInterID,HContractTransportEntryID," +
                           "HContractTransportBillNo,HCarrierID,HDistance,HTransportTimes," +
                           "HTransportTyep,HSSID,HCurID,HMoney,HDateForRequestedPick," +
                           "HDataForRequestedArrived,HCarryStatus,HDate_CarrierSure," +
                           "HDate_AllocationDriver,HCarID,HDriverID,HSurer_Arrive,HDate_Arrive," +
                           "HSurer_Pick,HDate_Pick,HSurer_Trans,HDate_Trans,HSurer_Receive," +
                           "HDate_Receive,HSurer_Accounting,HDate_Accounting) " +
                           "values(" +
                           SafeInt(omodel.HInterID.ToString(), 0) + "," + // HInterID
                           "0,0," + // HYear, HPeriod - éœ€è¦ä»ŽHDate计算,这里先给0
                           "'" + SafeString(this.BillType) + "'," +
                           "'" + SafeString(this.HBillSubType) + "'," +
                           SafeDateTime(omodel.HDate.ToString(), "'" + currentDateTime + "'") + "," +
                           "'" + SafeString(omodel.HBillNo) + "'," +
                           SafeInt(omodel.HBillStatus.ToString(), 1) + "," + // HBillStatus
                           SafeInt(omodel.HCheckItemNowID.ToString(), 0) + "," + // HCheckItemNowID
                           SafeInt(omodel.HCheckItemNextID.ToString(), 0) + "," + // HCheckItemNextID
                           SafeInt(omodel.HCheckFlowID.ToString(), 0) + "," + // HCheckFlowID
                           "'" + SafeString(omodel.HRemark) + "'," +
                           "'" + SafeString(omodel.HBacker) + "'," +
                           SafeDateTime(omodel.HBackDate?.ToString(), "NULL") + "," +
                           "'" + SafeString(omodel.HBackRemark) + "'," +
                           "'" + SafeString(omodel.HChecker) + "'," +
                           SafeDateTime(omodel.HCheckDate?.ToString(), "NULL") + "," +
                           "'" + SafeString(omodel.HMaker) + "',getdate()," + // HMaker, HMakeDate
                           "'" + SafeString(omodel.HUpDater) + "'," +
                           SafeDateTime(omodel.HUpDateDate?.ToString(), "NULL") + "," +
                           "'" + SafeString(omodel.HCloseMan) + "'," +
                           SafeDateTime(omodel.HCloseDate?.ToString(), "NULL") + "," +
                           (omodel.HCloseType.ToString() == "1" ? "1" : "0") + "," + // HCloseType
                           "'" + SafeString(omodel.HDeleteMan) + "'," +
                           SafeDateTime(omodel.HDeleteDate?.ToString(), "NULL") + "," +
                           "'" + SafeString(omodel.HMainSourceBillType) + "'," +
                           SafeInt(omodel.HMainSourceInterID.ToString(), 0) + "," + // HMainSourceInterID
                           SafeInt(omodel.HMainSourceEntryID.ToString(), 0) + "," + // HMainSourceEntryID
                           "'" + SafeString(omodel.HMainSourceBillNo) + "'," +
                           SafeInt(omodel.HPrintQty.ToString(), 0) + "," + // HPrintQty
                           SafeInt(omodel.HOrgID.ToString(), 0) + "," + // HOrgID
                           SafeInt(omodel.HCusID?.ToString(), 0) + "," + // HCusID
                           SafeInt(omodel.HBeginAddr?.ToString(), 0) + "," + // HBeginAddr
                           SafeInt(omodel.HEndAddr?.ToString(), 0) + "," + // HEndAddr
                           "'" + SafeString(omodel.HPickAddr) + "'," +
                           "'" + SafeString(omodel.HArriverAddr) + "'," +
                           "'" + SafeString(omodel.HTransType) + "'," +
                           SafeInt(omodel.HCarTypeID?.ToString(), 0) + "," + // HCarTypeID
                           SafeDecimal(omodel.HCarTypeMaxVolume?.ToString(), 0) + "," + // HCarTypeMaxVolume
                           SafeDecimal(omodel.HTotalVolume?.ToString(), 0) + "," + // HTotalVolume
                           SafeDecimal(omodel.HLoadingRate?.ToString(), 0) + "," + // HLoadingRate
                           SafeInt(omodel.HContractTransportInterID?.ToString(), 0) + "," + // HContractTransportInterID
                           SafeInt(omodel.HContractTransportEntryID?.ToString(), 0) + "," + // HContractTransportEntryID
                           "'" + SafeString(omodel.HContractTransportBillNo) + "'," +
                           SafeInt(omodel.HCarrierID?.ToString(), 0) + "," + // HCarrierID
                           SafeDecimal(omodel.HDistance?.ToString(), 0) + "," + // HDistance
                           SafeDecimal(omodel.HTransportTimes?.ToString(), 0) + "," + // HTransportTimes
                           "'" + SafeString(omodel.HTransportTyep) + "'," +
                           SafeInt(omodel.HSSID?.ToString(), 0) + "," + // HSSID
                           SafeInt(omodel.HCurID?.ToString(), 0) + "," + // HCurID
                           SafeDecimal(omodel.HMoney?.ToString(), 0) + "," + // HMoney
                           SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
                           SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," +
                           SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID
                           SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID
                           "'" + SafeString(omodel.HSurer_Arrive) + "'," +
                           SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + currentDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Pick) + "'," +
                           SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + currentDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Trans) + "'," +
                           SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + currentDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Receive) + "'," +
                           SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + currentDateTime + "'") + "," +
                           "'" + SafeString(omodel.HSurer_Accounting) + "'," +
                           SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + currentDateTime + "'") + ")";
                oCn.RunProc(sql);
                //主表
                //插入子表
                foreach (Model.ClsWL_YayBillMainBillSub oSub in DetailColl)
                {
                    sql = "Insert into WL_YayBillSub_Material " +
              "(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
              ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
              ",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
              ",HMouldFoldHeight,HVolume,HQty,HSNP,HMouldQty) values("
              + SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
              + SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
              + (oSub.HEntryID) + ",'" // HEntryID int
              + SafeString(oSub.HCloseMan?.ToString()) + "','" // HCloseMan varchar(20)
              + (oSub.HEntryCloseDate == null ? DateTime.Now : oSub.HEntryCloseDate) + "'," // HEntryCloseDate datetime
              + (oSub.HCloseType ? "1" : "0") + ",'" // HCloseType bit
              + SafeString(oSub.HRemark?.ToString() ?? "") + "'," // HRemark varchar(200)
              + (oSub.HSourceInterID == null ? 0 : oSub.HSourceInterID) + "," // HSourceInterID int
              + (oSub.HSourceEntryID == null ? 0 : oSub.HSourceEntryID) + ",'" // HSourceEntryID int
              + SafeString(oSub.HSourceBillNo?.ToString(), "") + "','" // HSourceBillNo varchar(50)
              + SafeString(oSub.HSourceBillType?.ToString(), "") + "'," // HSourceBillType varchar(10)
              + (oSub.HRelationQty == null ? 0 : oSub.HRelationQty) + "," // HRelationQty dec(18,8)
              + (oSub.HRelationMoney) + "," // HRelationMoney dec(18,8)
              + (oSub.HMaterID) + "," // HMaterID int
              + (oSub.HUnitID.ToString() == "" ? 0 : oSub.HUnitID) + "," // HUnitID int
              + (oSub.HMouldID) + "," // HMouldID int
              + (oSub.HMouldLength.ToString() == "" ? 0 : oSub.HMouldLength) + "," // HMouldLength dec(18,8)
              + (oSub.HMouldHeight.ToString() == "" ? 0 : oSub.HMouldHeight) + "," // HMouldHeight dec(18,8)
              + (oSub.HMouldWidth.ToString() == "" ? 0 : oSub.HMouldWidth) + "," // HMouldWidth dec(18,8)
              + (oSub.HMouldFoldHeight.ToString() == "" ? 0 : oSub.HMouldFoldHeight) + "," // HMouldFoldHeight dec(18,8)
              + (oSub.HVolume.ToString() == "" ? 0 : oSub.HVolume) + "," // HVolume dec(18,8)
              + (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
              + (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
              + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
                    oCn.RunProc(sql);
                }
                    //=========================保存后控制
                    DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后控制判断失败!";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "保存失败2!" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //============================
                sReturn = "新增单据成功!";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
    }
}
DAL/DAL.csproj
@@ -81,6 +81,7 @@
    <Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
    <Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
    <Compile Include="ClsGy_MaterialPackingRelation.cs" />
    <Compile Include="ClsWL_YayBillMain.cs" />
    <Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
    <Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />
    <Compile Include="仓库管理\小车锁定\ClsKf_TrolleyPositionBill.cs" />
DAL/bin/Release/DAL.dll
Binary files differ
DAL/bin/Release/DAL.pdb
Binary files differ
DAL/bin/Release/DBUtility.dll
Binary files differ
DAL/bin/Release/DBUtility.pdb
Binary files differ
DAL/bin/Release/Model.dll
Binary files differ
DAL/bin/Release/Model.pdb
Binary files differ
DAL/bin/Release/Pub_Class.dll
Binary files differ
DAL/bin/Release/Pub_Class.pdb
Binary files differ
DAL/bin/Release/Pub_Control.dll
Binary files differ
DAL/bin/Release/Pub_Control.pdb
Binary files differ
DAL/bin/Release/SQLHelper.dll
Binary files differ
DAL/bin/Release/SQLHelper.pdb
Binary files differ
DBUtility/bin/Release/DBUtility.dll
Binary files differ
DBUtility/bin/Release/DBUtility.pdb
Binary files differ
DBUtility/bin/Release/Pub_Class.dll
Binary files differ
DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
DBUtility/bin/Release/Pub_Control.dll
Binary files differ
DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
DBUtility/bin/Release/SQLHelper.dll
Binary files differ
DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
DBUtility/obj/Release/DBUtility.dll
Binary files differ
DBUtility/obj/Release/DBUtility.pdb
Binary files differ
Model/Model.csproj
@@ -126,6 +126,8 @@
    <Compile Include="基础资料\基础资料\ClsGy_RepairCheckClass_Model.cs" />
    <Compile Include="物流管理\ClsCg_CarTrajectoryBillMain.cs" />
    <Compile Include="物流管理\ClsCg_CarTrajectoryBillSub.cs" />
    <Compile Include="物流管理\ClsWL_YayBillMainBillSub.cs" />
    <Compile Include="物流管理\ClsWL_YayBillMainBillMain.cs" />
    <Compile Include="生产管理\ClsSc_ShiftsBeginInfoBillMain.cs" />
    <Compile Include="生产管理\ClsSc_ShiftsBeginInfoBillSub.cs" />
    <Compile Include="ClsHR_EmpFosterBillMain.cs" />
Model/bin/Release/DBUtility.dll
Binary files differ
Model/bin/Release/DBUtility.pdb
Binary files differ
Model/bin/Release/Model.dll
Binary files differ
Model/bin/Release/Model.pdb
Binary files differ
Model/bin/Release/Pub_Class.dll
Binary files differ
Model/bin/Release/Pub_Class.pdb
Binary files differ
Model/bin/Release/Pub_Control.dll
Binary files differ
Model/bin/Release/Pub_Control.pdb
Binary files differ
Model/bin/Release/SQLHelper.dll
Binary files differ
Model/bin/Release/SQLHelper.pdb
Binary files differ
Model/obj/Release/Model.dll
Binary files differ
Model/obj/Release/Model.pdb
Binary files differ
Model/ÎïÁ÷¹ÜÀí/ClsWL_YayBillMainBillMain.cs
New file
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsWL_YayBillMainBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HCheckEmp;
        public Int64 HDeptID;
        public Int64 HEmpID;
        public Int64 HOrgID;
        public Int64 HPrintQty;
        // æ–°å¢žå­—段
        public int? HCusID;                          // å®¢æˆ·ID
        public int? HBeginAddr;                      // å§‹å‘地
        public int? HEndAddr;                        // ç›®çš„地
        public string HPickAddr;                     // æè´§åœ°å€
        public string HArriverAddr;                  // åˆ°è´§åœ°å€
        public string HTransType;                    // è¿è¾“方式(整车、零单)
        public int? HCarTypeID;                      // è½¦åž‹ID
        public decimal? HCarTypeMaxVolume;           // è½¦åž‹æœ€å¤§å®¹ç§¯
        public decimal? HTotalVolume;                // æ€»ä½“积(平方米)
        public decimal? HLoadingRate;                // è£…载率
        public int? HContractTransportInterID;       // æ‰¿è¿åˆåŒID
        public int? HContractTransportEntryID;       // æ‰¿è¿åˆåŒå­ID
        public string HContractTransportBillNo;      // æ‰¿è¿åˆåŒå•据号
        public int? HCarrierID;                      // æ‰¿è¿å•†ID
        public decimal? HDistance;                   // è·ç¦»ï¼ˆå…¬é‡Œï¼‰
        public decimal? HTransportTimes;             // è¿è¾“时效
        public string HTransportTyep;                // è¿è¾“类型(单程,往返)
        public int? HSSID;                           // ç»“算方式
        public int? HCurID;                          // å¸åˆ«
        public decimal? HMoney;                      // è¿è¾“费用
        public DateTime? HDateForRequestedPick;      // è¦æ±‚提货时间
        public DateTime? HDataForRequestedArrived;   // è¦æ±‚到货时间
        public int? HCarryStatus;                    // ç‰©æµçŠ¶æ€ï¼ˆ1-9)
        public DateTime? HDate_CarrierSure;          // æ‰¿è¿å•†ç¡®è®¤æ—¶é—´
        public DateTime? HDate_AllocationDriver;     // åˆ†é…å¸æœºæ—¶é—´
        public int? HCarID;                          // è½¦è¾†ID
        public int? HDriverID;                       // å¸æœºID
        public string HSurer_Arrive;                 // åˆ°åŽ‚ç¡®è®¤äºº
        public DateTime? HDate_Arrive;               // åˆ°åŽ‚ç¡®è®¤æ—¶é—´
        public string HSurer_Pick;                   // æè´§ç¡®è®¤äºº
        public DateTime? HDate_Pick;                 // æè´§ç¡®è®¤æ—¶é—´
        public string HSurer_Trans;                  // å‡ºåŽ‚è¿è¾“ç¡®è®¤äºº
        public DateTime? HDate_Trans;                // å‡ºåŽ‚è¿è¾“ç¡®è®¤æ—¶é—´
        public string HSurer_Receive;                // ç­¾æ”¶ç¡®è®¤äºº
        public DateTime? HDate_Receive;              // ç­¾æ”¶ç¡®è®¤æ—¶é—´
        public string HSurer_Accounting;             // æ ¸ç®—人
        public DateTime? HDate_Accounting;           // æ ¸ç®—æ—¶é—´
    }
}
Model/ÎïÁ÷¹ÜÀí/ClsWL_YayBillMainBillSub.cs
New file
@@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsWL_YayBillMainBillSub : DBUtility.ClsXt_BaseBillMain
    {
        // å…³è”主表
        public int HInterID { get; set; }                      // ä¸»å†…码
        public string HBillNo_bak { get; set; }                // å•据号(备份)
        // å­è¡¨ä¿¡æ¯
        public int HEntryID { get; set; }                      // å­å†…码
        // è¡Œå…³é—­ç›¸å…³
        public string HCloseMan { get; set; }                  // è¡Œå…³é—­äºº
        public DateTime HEntryCloseDate { get; set; }          // è¡Œå…³é—­æ—¥æœŸ
        public bool HCloseType { get; set; }                   // å…³é—­ç±»åž‹
        // å¤‡æ³¨
        public string HRemark { get; set; }                    // è¡¨ä½“备注
        // æºå•信息
        public int HSourceInterID { get; set; }                // æºå•ID
        public int HSourceEntryID { get; set; }                // æºå•子ID
        public string HSourceBillNo { get; set; }              // æºå•单号
        public string HSourceBillType { get; set; }            // æºå•类型
        public decimal HRelationQty { get; set; }              // å…³è”数量
        public decimal HRelationMoney { get; set; }            // å…³è”金额
        // è‡ªå¢žåˆ—
        public int HItemSubID { get; set; }                    // è‡ªå¢žåˆ—
        ///自定义
        public int HMaterID { get; set; }
        public int HUnitID { get; set; }
        public int HMouldID { get; set; }
        public decimal HMouldLength { get; set; }
        public decimal HMouldHeight { get; set; }
        public decimal HMouldWidth { get; set; }
        public decimal HMouldFoldHeight { get; set; }
        public decimal HVolume { get; set; }
        public decimal HQty { get; set; }
        public decimal HSNP { get; set; }
        public decimal HMouldQty { get; set; }
    }
}
Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,5 +1,37 @@
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
New file
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
New file
@@ -0,0 +1 @@
5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
New file
@@ -0,0 +1,5 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
WarM/ÌõÂë´òÓ¡/Gy_BarCodeBillList.cs
@@ -29,6 +29,7 @@
        public const string ModRightNameDelete = ModRightName + "_Delete";  //作废
        public const string ModRightNamePrint = ModRightName + "_Print";    //打印
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        public int selectRow = 0;
@@ -225,6 +226,27 @@
            }
            else
            {
                //获取系统参数
                string sErrMsg = "";
                if (oSystemParameter.ShowBillByOrgID(DBUtility.ClsPub.HOrgID, ref sErrMsg) == true)
                {
                    //除admin账号外,只能删除当前账号所生成的条码
                    if (DBUtility.ClsPub.CurUserName.ToUpper() != "ADMIN"  //admin账号
                        && oSystemParameter.omodel.BarCode_DeleterAndMakerMustSame.ToUpper() == "Y") //系统参数 åˆ¶å•人与删除人是否一致
                    {
                        if (DBUtility.ClsPub.CurUserName != DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[0].Cells[Fun_GetCol("制作人")].Value))
                        {
                            MessageBox.Show("删除人与制单人必须一致,删除失败!", "提示");
                            return;
                        }
                    }
                }
                else
                {
                    MessageBox.Show("获取系统参数失败!", "提示");
                    return;
                }
                if (MessageBox.Show("确定要删除所选条码?删除后不能恢复,请谨慎操作!", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
                {
                    Int64 HItemID = 0;
@@ -271,6 +293,30 @@
            }
            else
            {
                //获取系统参数
                string sErrMsg = "";
                if (oSystemParameter.ShowBillByOrgID(DBUtility.ClsPub.HOrgID, ref sErrMsg) == true)
                {
                    //除admin账号外,只能删除当前账号所生成的条码
                    if (DBUtility.ClsPub.CurUserName.ToUpper() != "ADMIN"  //admin账号
                        && oSystemParameter.omodel.BarCode_DeleterAndMakerMustSame.ToUpper() == "Y") //系统参数 åˆ¶å•人与删除人是否一致
                    {
                        for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
                        {
                            if (DBUtility.ClsPub.CurUserName != DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("制作人")].Value))
                            {
                                MessageBox.Show("存在删除人与制单人不一致的行,删除失败!", "提示");
                                return;
                            }
                        }
                    }
                }
                else
                {
                    MessageBox.Show("获取系统参数失败!", "提示");
                    return;
                }
                if (MessageBox.Show("确定要批量删除所选条码?删除后不能恢复,请谨慎操作!", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
                {
                    string HItemID = "";
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -2891,7 +2891,6 @@
                string HUpDater = mainList[0].HUpDater;
                string HMaterNumber = mainList[0].HMaterNumber;
                string HSupNumber = mainList[0].HSupNumber;
                long HPrintQty = mainList[0].HPrintQty;
                string HMouldOWNER = mainList[0].HMouldOWNER;
                string HSaveLife = mainList[0].HSaveLife;
                int HCaveQty = mainList[0].HCaveQty;
@@ -2949,7 +2948,7 @@
                }
                //=========================================================
                                //主表
                //主表
                oCN.RunProc("UpDate Gy_MouldFileMain set  " +
                 " HBillNo='" + HBillNo + "'" +  //固定赋值===============
                 ",HDate='" + HDate + "'" +
@@ -2979,7 +2978,6 @@
                 ",HDeptID=" + HDeptID.ToString() +
                 ",HSupID=" + HSupID.ToString() +
                 ",HSupNumber='" + HSupNumber + "'" +
                 ",HPrintQty=" + HPrintQty.ToString() +
                 ",HMouldStatus='" + HMouldStatus + "'" +
                 ",HSaveLife='" + HSaveLife + "'" +
                 ",HWhID=" + HWHID.ToString() +
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -948,7 +948,7 @@
                using (StreamReader sr = new StreamReader(Path.Combine(path, $"{language}.json"), Encoding.UTF8))
                {
                    string lines;
                    while ((lines = sr.ReadLine()) != null)//一行一行去读,如果读取这一行赋值lines,并且lines= null证明读取完了
                    while ((lines = sr.ReadLine()) != null)
                    {
                        JsonStr1 += lines;
@@ -981,7 +981,7 @@
                        keySelector: p => $@"{p.HModuleCode}_{p.HFieldCode}",
                        elementSelector:  p => p.rowNum
                    );
                    int subIndex = 0;
                    // ç‰ˆæœ¬å·ä¸ä¸€è‡´ åˆ™è¯»å–数据库中的字段,将字段写入到json对象中
                    foreach (DataRow row in ds.Tables[0].Rows)
                    {
@@ -1007,8 +1007,23 @@
                                languagePack[HModuleCode][HFieldCode] = new JArray();
                            }
                            var targetJArray = (JArray)languagePack[HModuleCode][HFieldCode];
                            targetJArray.Add(row[lang].ToString());
                            var targetJArray = languagePack[HModuleCode][HFieldCode] as JArray;
                            if (subIndex < rowNum - 1)
                            {
                                if (targetJArray.Count < subIndex + 1)
                                {
                                    targetJArray.Add(row[lang].ToString());
                                }else
                                {
                                    targetJArray[subIndex] = row[lang].ToString();
                                }
                                subIndex++;
                            }else
                            {
                                subIndex = 0;
                            }
                        }
                        
                    }
@@ -1019,7 +1034,7 @@
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Success!";
                    objJsonResult.data = languagePack.ToString();
                    objJsonResult.data = languagePack;
                    return objJsonResult;
                } else
                {
@@ -1027,7 +1042,7 @@
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Success!";
                    objJsonResult.data = JsonStr1;
                    objJsonResult.data = JObject.Parse(JsonStr1);
                    return objJsonResult;
                }
            }
@@ -1036,6 +1051,72 @@
                LogService.Write("Exception!" + e.ToString());
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å•据翻译 è¯­è¨€åŒ…缺失的键 åå‘映射到数据库
        [Route("Xt_grdAlignment_WMES/syncMissingKeyToDB")]
        [HttpGet]
        public Object syncMissingKeyToDB(string missingObj)
        {
            oCN.BeginTran();
            try
            {
                // é€’入的参数 ç»“构是 { æ¨¡å—名: [字段名1,字段名2] }
                JObject missingKeys = JObject.Parse(missingObj);
                // éåކ顶层JObject对象
                foreach(var HMouldNameKVP in missingKeys)
                {
                    // æŸ¥è¯¢ä¸»è¡¨ä¸­æ˜¯å¦å­˜åœ¨è¯¥æ¨¡å— å­˜åœ¨ï¼Œåˆ™è¿”回主表中的模块HInterID,不存在,则获取最大HInterID+1
                    string HMouldCode = HMouldNameKVP.Key;
                    ds = oCN.RunProcReturn($"Exec h_p_syncMissingKeyToDB @HModuleCode='{HMouldCode}'", "h_p_syncMissingKeyToDB");
                    int HInterID = (int)ds.Tables[0].Rows[0]["HInterID"];
                    int rowCount = (int)ds.Tables[0].Rows[0]["rc"];
                    int HEntryID = (int)ds.Tables[0].Rows[0]["HEntryID"];
                    // æ’入主表
                    if (rowCount == 0)
                    {
                        oCN.RunProc($@"insert into Xt_LanModuleMain(HInterID, HBillType, HModuleName, HModuleCode)
                        values({HInterID}, 3033, '', '{HMouldCode}')");
                    }
                    string sql = $@"insert into Xt_LanModuleSub(HInterID, HEntryID, HFieldModelType, HFieldCode, HFieldName, HTranslationText_English, HTranslationText_Spain)
                                    values";
                    // æ’入子表
                    JArray HFieldCodes = HMouldNameKVP.Value as JArray;
                    for(int i=0;i<HFieldCodes.Count; i++)
                    {
                        sql += $@"({HInterID}, {HEntryID+i}, 'i18n', '{HFieldCodes[i]}','{HFieldCodes[i]}','{HFieldCodes[i]}','{HFieldCodes[i]}'),";
                    }
                    sql = sql.Substring(0, sql.Length - 1) + ";";
                    oCN.RunProc(sql);
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Success!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                LogService.Write("Exception!" + e.ToString());
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.Message.ToString();
                objJsonResult.data = null;
                return objJsonResult;
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -1728,11 +1728,11 @@
                    ds = oCN.RunProcReturn("select * from Sc_SourceLineRepairBillSub_Mater where HInterID=" + model.HInterID+ " order by HEntryID  desc", "Sc_SourceLineRepairBillSub_Mater");
                    oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub_Mater
(HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID
,HSourceEntryID,HSourceBillNo,HSourceBillType,HMaterID
,HUnitID,HBarCode,HBatchNo )values
({model.HInterID},{(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)},'{model.HBillNo}','',{temp.HProcExchInterID}
,{temp.HProcExchEntryID},'{temp.HProcExchBillNo}','',{temp.HMaterID},0,'{temp.HBarCode}','{temp.HBatchNo}')");
                    (HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID
                    ,HSourceEntryID,HSourceBillNo,HSourceBillType,HMaterID
                    ,HUnitID,HBarCode,HBatchNo )values
                    ({model.HInterID},{(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)},'{model.HBillNo}','',{temp.HProcExchInterID}
                    ,{temp.HProcExchEntryID},'{temp.HProcExchBillNo}','',{temp.HMaterID},0,'{temp.HBarCode}','{temp.HBatchNo}')");
                    //修改产线追溯单绑定的条码批号
                    oCN.RunProc("update Sc_AssemblyBillSub set HBarCode='" + temp.HBarCode + "' where HInterID=" + temp.HInterID + " and HEntryID=" + temp.HEntryID);
@@ -1743,21 +1743,21 @@
                    model = JsonConvert.DeserializeObject<Model.ClsSc_SourceLineRepairBillMain>(sMainStr);
                    oCN.RunProc($@"insert into Sc_SourceLineRepairBillMain(HYear, HPeriod, HBillType, HBillSubType, HInterID,
HDate, HBillNo, HBillStatus, HRemark, HEmpID, HDeptID, HSourceID, HProdOrgID, HMaterID, HWorkStationID,
HProcess, HIPAddr, HMacAddr, HProdMac, HBarCode,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
values('{DateTime.Now.Year}','{DateTime.Now.Month}','3748','3748',{model.HInterID}
,getdate(),'{model.HBillNo}','1','{HResult}',{model.HEmpID},{model.HDeptID},{model.HSourceID},{model.HProdOrgID},{model.HMaterID},0
,{model.HProcess},'','','','{model.HBarCode}','{user}',getdate(),{model.HICMOInterID},{model.HICMOEntryID},'{model.HICMOBillNo}')");
                    HDate, HBillNo, HBillStatus, HRemark, HEmpID, HDeptID, HSourceID, HProdOrgID, HMaterID, HWorkStationID,
                    HProcess, HIPAddr, HMacAddr, HProdMac, HBarCode,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo)
                    values('{DateTime.Now.Year}','{DateTime.Now.Month}','3748','3748',{model.HInterID}
                    ,getdate(),'{model.HBillNo}','1','{HResult}',{model.HEmpID},{model.HDeptID},{model.HSourceID},{model.HProdOrgID},{model.HMaterID},0
                    ,{model.HProcess},'','','','{model.HBarCode}','{user}',getdate(),{model.HICMOInterID},{model.HICMOEntryID},'{model.HICMOBillNo}')");
                    List<Model.ClsSc_SourceLineRepairBillSub> subLsit = new List<Model.ClsSc_SourceLineRepairBillSub>();
                    sMainStr = "[" + sMainStr + "]";
                    subLsit = JsonConvert.DeserializeObject<List<Model.ClsSc_SourceLineRepairBillSub>>(sMainStr);
                    oCN.RunProc($@"insert into Sc_SourceLineRepairBillSub
(HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
,HBadReasonID,HBadTypeID,HBadResultID,HBadProcID,HRepairResult,HCreator,HCreateDate)
values({model.HInterID},1,'{model.HBillNo}','',{subLsit[0].HProcExchInterID},{subLsit[0].HProcExchEntryID},'{subLsit[0].HProcExchBillNo}',''
,{subLsit[0].HBadReasonID},{subLsit[0].HBadTypeID},{subLsit[0].HBadResultID},{model.HBadProcID},'{HResult}','{subLsit[0].HCreator}',getdate())");
                    (HInterID,HEntryID,HBillNo_bak,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
                    ,HBadReasonID,HBadTypeID,HBadResultID,HBadProcID,HRepairResult,HCreator,HCreateDate)
                    values({model.HInterID},1,'{model.HBillNo}','{model.HRemark}',{subLsit[0].HProcExchInterID},{subLsit[0].HProcExchEntryID},'{subLsit[0].HProcExchBillNo}',''
                    ,{subLsit[0].HBadReasonID},{subLsit[0].HBadTypeID},{subLsit[0].HBadResultID},{model.HBadProcID},'{HResult}','{subLsit[0].HCreator}',getdate())");
                    if (HResult == "OK")
                    {
WebAPI/Controllers/QC_InStockCheckBillController.cs
New file
@@ -0,0 +1,384 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SyntacticSugar.constant;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    /// <summary>
    /// åœ¨åº“检验单控制器
    /// </summary>
    public class QC_InStockCheckBillController : ApiController
    {
        public DataSet ds = new DataSet();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        #region åœ¨åº“检验单提交单据
        [Route("QC_InStockCheckBill/saveBill")]
        [HttpPost]
        public Object saveBill([FromBody] JObject sMainSub)
        {
            // æ­¤å¤„ è¡¨å•结构: {sMain: sMain, sSub: {materNum: [BarCodeInfo]}}
            JObject sMain = sMainSub["sMain"] as JObject;
            JObject sSub = sMainSub["sSub"] as JObject;
            oCN.BeginTran();
            try
            {
                int i = 1;
                // æ’入主表
                oCN.RunProc($@"
                    insert into QC_InStockCheckBillMain(HYear, HPeriod, HBillType, HInterID, HDate,
                    HBillNo, HBillStatus, HMaker, HMakeDate)
                    values({sMain["HYear"]}, {sMain["HPeriod"]}, '{sMain["HBillType"]}', {sMain["HInterID"]},  CONVERT(DATE, '{sMain["HDate"]}'),
                    '{sMain["HBillNo"]}', 1, '{sMain["HUser"]}', getdate());
                ");
                foreach (var sSubKVP in sSub)
                {
                    JObject sSubValue = sSubKVP.Value as JObject;
                    // æ’入子表
                    oCN.RunProc($@"
                        insert into QC_InStockCheckBillSub(HInterID, HBillNo_bak, HEntryID, HInStockCheckEmp, HInStockCheckTime,
                        HMaterID, HRightQty, HBadQty)
                        values({sMain["HInterID"]}, '{sMain["HBillNo"]}', {i++}, '{sMain["HUser"]}', getdate(), {sSubValue["HMaterID"]}
                        , {sSubValue["HRightQty"]}, {sSubValue["HBadQty"]})
                    ");
                    // åå†™æ¡ç ä¸»æ¡£
                    JArray HBarCodeCache = sSubValue["HBarCodeCache"] as JArray;
                    foreach (var HBarCode in HBarCodeCache)
                    {
                        LogService.Write($@"update Gy_BarCodeBill set HBarCodeStatus='{HBarCode["HBarCodeState"]}' where HBarCode='{HBarCode["HBarCode"]}' ");
                        oCN.RunProc($@"update Gy_BarCodeBill set HBarCodeStatus='{HBarCode["HBarCodeState"]}' where HBarCode='{HBarCode["HBarCode"]}' ");
                    }
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Success!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch(Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region åœ¨åº“检验单 æ‰«ç‰©æ–™ç  å¸¦å‡ºç‰©æ–™/条码临时表信息
        internal class ClsKF_PonderationBillMain_Temp_InStockCheckBill
        {
            public long HItemID;
            public long HSourceEntryID;
            public string HSourceBillNo;
            public string HSourceBillType;
            public long HRelationInterID;
            public long HRelationEntryID;
            public string HRelationBillNo;
            public long HErpClsID;
            public bool HRedBlueFlag;
            public string HBatchNo;
            public long HInstructID;
            public string HInstructNo;
            public long HSeOrderBillID;
            public string HSeOrderBillNo;
            public string HNordan;
            public long HAuxPropID;
            public string HMTONo;
            public long HSTOCKORGID;
            public long HOWNERID;
            public string HCusBarCode;
            public string HSubBillType;
            public long HMulSourceBill;
            public string HBeginDate;
            public string HEndDate;
            public long HSourceInterID;
            public long HUnitID;
            public DateTime HMakeDate;
            public string HAddr;
            public long HInterID;
            public string HBillNo;
            public string HBillType;
            public long HMaterID;
            public string HMaterNumber;
            public string HMaterName;
            public string HMaterModel;
            public long HProcID;
            public string HProcName;
            public long HWhID;
            public string HWhName;
            public long HSCWHID;
            public string HSCWHName;
            public long HStockPlaceID;
            public string HStockPlaceName;
            public long HOutStockPlaceID;
            public string HOutStockPlaceName;
            public long HGroupID;
            public string HGroupName;
            public double HQtyMust;
            public double HQty;
            public double HPieceQty;
            public string HBarCode;
            public string HMaker;
            public string HBarCodeStatus;
            public double HBadQty;
            public double HRightQty;
        }
        [Route("QC_InStockCheckBill/getBarCode")]
        [HttpGet]
        public Object getBarCode(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockOrgID, string HScanStyle, string HCustom1, string HCustom2, string sBarCodeStatus)
        {
            ClsKF_PonderationBillMain_Temp_InStockCheckBill oMain = new ClsKF_PonderationBillMain_Temp_InStockCheckBill();
            string sErrMsg = "";
            oCN.BeginTran();
            try
            {
                if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == false)
                {
                    sErrMsg = "获取系统参数失败! " + sErrMsg;
                    return null;
                }
                // æ­¤æŽ§åˆ¶å™¨å•据类型固定为 7526
                var ds2 = oCN.RunProcReturn("select * from KF_PonderationBillMain_Temp_InStockCheckBill where HBarCode='" + sBarCode + "'and HInterID = " + HInterID, "KF_PonderationBillMain_Temp_InStockCheckBill");
                ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList where æ¡ç ç¼–号='" + sBarCode + "'", "h_v_IF_BarCodeBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫码失败! è¯¥æ¡ç ä¸åœ¨æ¡ç æ¡£æ¡ˆä¸­...";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds2.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫码失败! æ­¤å•据已扫过该条码...";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var rowOne = ds.Tables[0].Rows[0];
                oMain.HBillNo = HBillNo;
                oMain.HBillType = HBillType;
                oMain.HMaker = HMaker;
                oMain.HMaterID = long.Parse(rowOne["HMaterID"].ToString());
                oMain.HQtyMust = 0;
                oMain.HQty = double.Parse(rowOne["数量"].ToString());
                oMain.HMTONo = rowOne["计划跟踪号"].ToString();
                oMain.HWhID = HWhID;
                oMain.HStockPlaceID = HSPID;
                oMain.HSCWHID = 0;
                oMain.HOutStockPlaceID = 0;
                oMain.HPieceQty = 1;
                oMain.HSourceInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceInterID"]);
                oMain.HSourceEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceEntryID"]);
                oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["源单单号"]);
                oMain.HSourceBillType = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HSourceBillType"]);
                oMain.HSTOCKORGID = HStockOrgID;
                oMain.HOWNERID = HStockOrgID;
                oMain.HCusBarCode = HCustom1;
                oMain.HBarCode = sBarCode;
                oMain.HBarCodeStatus = sBarCodeStatus;
                oMain.HBadQty = 0;
                oMain.HRightQty = 0;
                if(sBarCodeStatus == "正常")
                {
                    oMain.HRightQty = oMain.HQty;
                }
                else if (sBarCodeStatus == "异常")
                {
                    oMain.HBadQty = oMain.HQty;
                }
                    // å†™å…¥ä¸´æ—¶è¡¨
                    oCN.RunProc("Insert into KF_PonderationBillMain_Temp_InStockCheckBill " +
                "(HInterID,HBillNo,HBillType,HMaterID,HUnitID,HAuxPropID,HProcID" +
                ",HWhID,HSCWHID,HStockPlaceID,HOutStockPlaceID,HGroupID,HAddr" +
                ",HQtyMust,HQty,HPieceQty,HBatchNo,HBarCode,HBarCode_Pack" +
                ",HMaker,HMakeDate,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo" +
                ",HRelationInterID,HRelationEntryID,HRelationBillNo,HRedBlueFlag,HMTONo,HPlanMode" +
                ",HSTOCKORGID,HOtherOrgID,HOWNERID,HOWNERTYPEID,HExpressNumber,HSubBillType" +
                ",HCusID,HDeptID,HCusBarCode,HMulSourceBill,HBeginDate,HEndDate, HBadQty, HRightQty, HBarCodeStatus) " +
                " Values(" + HInterID + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'," + oMain.HMaterID.ToString() + "," + oMain.HUnitID.ToString() + "," + oMain.HAuxPropID.ToString() + "," + oMain.HProcID.ToString() +
                "," + oMain.HWhID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HStockPlaceID.ToString() + "," + oMain.HOutStockPlaceID.ToString() + "," + oMain.HGroupID.ToString() + ",'" + oMain.HAddr + "'" +
                "," + oMain.HQtyMust.ToString() + "," + oMain.HQty.ToString() + "," + oMain.HPieceQty.ToString() + ",'" + oMain.HBatchNo + "','" + oMain.HBarCode + "',''" +
                ",'" + oMain.HMaker + "',getdate()," + oMain.HSourceInterID.ToString() + "," + oMain.HSourceEntryID.ToString() + ",'" + oMain.HSourceBillType + "','" + oMain.HSourceBillNo + "'" +
                "," + oMain.HRelationInterID.ToString() + "," + oMain.HRelationEntryID.ToString() + ",'" + oMain.HRelationBillNo + "'," + Convert.ToString(oMain.HRedBlueFlag ? 1 : 0) + ",'" + oMain.HMTONo + "',0" +
                "," + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() + "," + oMain.HSTOCKORGID.ToString() + ",'','','" + oMain.HSubBillType + "'" +
                ",0,0,'" + oMain.HCusBarCode + "'," + oMain.HMulSourceBill.ToString() + "," + (oMain.HBeginDate == "" ? "NULL" : "'" + oMain.HBeginDate + "'") +
                "," + (oMain.HEndDate == "" ? "NULL" : "'" + oMain.HEndDate + "'") + $@",{oMain.HBadQty}, {oMain.HRightQty}, '{oMain.HBarCodeStatus}')");
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch(Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è¿”回物料/条码明细
        [Route("QC_InStockCheckBillController/GetBillEntryTmpList_Json")]
        [HttpGet]
        public object GetBillEntryTmpList_Json(long HInterID, string HBillNo, int HBillType, int HStockOrgID)
        {
            try
            {
                DataSet DS = oCN.RunProcReturn("exec h_p_WMS_BillEntryTmpList_InStockCheckBill " + HInterID.ToString() + ",'" + HBillType + "'", "h_p_WMS_BillEntryTmpList_InStockCheckBill");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = DS.Tables;
                return objJsonResult;
            }
            catch(Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region åœ¨åº“检验单 åˆ é™¤æ¡ç ç¼“å­˜
        [Route("QC_InStockCheckBillController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json")]
        [HttpGet]
        public object set_DelPonderationBillMain_Temp_InterIDAndSource_Json(long HItemID, long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string HBillType)
        {
            try
            {
                oCN.RunProc("Delete from KF_PonderationBillMain_Temp_InStockCheckBill where HItemID="+HItemID+" and HInterID=" + HInterID.ToString() + " and HMaterID= " + HMaterID.ToString() + " and HAuxPropID= " + HAuxPropID.ToString() + " and HBillType='" + HBillType + "' and HSourceInterID=" + HSourceInterID.ToString() + " and HSourceEntryID=" + HSourceEntryID.ToString() + " and HQty<>0 ", ref DBUtility.ClsPub.sExeReturnInfo);
                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;
            }
        }
        #endregion
        #region åœ¨åº“检验单 èŽ·å–å•æ®åˆ—è¡¨
        [Route("QC_InStockCheckBillController/getList")]
        [HttpGet]
        public Object getList(string sWhere, string user)
        {
            try {
                if (string.IsNullOrWhiteSpace(sWhere))
                {
                    ds = oCN.RunProcReturn($@"select * from h_v_QC_InStockCheckBillList", "h_v_QC_InStockCheckBillList");
                }else
                {
                    ds = oCN.RunProcReturn($@"select * from h_v_QC_InStockCheckBillList where 1 = 1 and {sWhere}", "");
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取单据列表成功!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取单据列表失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region åœ¨åº“检验单 èŽ·å–å•æ®åˆ—è¡¨åˆ†é¡µ
        [Route("QC_InStockCheckBillController/getListPage")]
        [HttpGet]
        public object getListPage(string sWhere, string user, string page, string size)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (string.IsNullOrWhiteSpace(sWhere) == false)
                {
                    sWhere = sWhere.Replace("\"", "'");
                    sWhere = sWhere.Replace("'", "''");
                }
                string sql = "exec h_p_QC_InStockCheckBillListPage " + page + "," + size + ",'" + sWhere + "'";
                ds = oCN.RunProcReturn(sql, "h_p_QC_InStockCheckBillListPage");
                //添加列名
                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列对象的列名
                }
                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1708,22 +1708,26 @@
                    return objJsonResult;
                }
                // string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
                //             join AIS20210811135644..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
                //             join AIS20210811135644..T_BD_STAFFTEMP c on c.FID = a.FID
                //             join AIS20210811135644..T_BD_DEPARTMENT d on c.FDEPTID = d.FDEPTID
                //             where e.HItemID ='" + HKeeperID + "' ";
                // //查询质检员对应质检部门
                // ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
                // LogService.Write("sql" + sql);
                // if (ds.Tables[0].Rows.Count == 0)
                // {
                //     objJsonResult.code = "0";
                //     objJsonResult.count = 0;
                //     objJsonResult.Message = "操作失败,质检员对应质检部门无数据。" + sql;
                //     objJsonResult.data = null;
                //     return objJsonResult;
                // }
                //if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                //{
                    string sql = @"select a.FID,a.FNUMBER Employee,d.FNUMBER Dept from Gy_Employee e
                             join JL20250716203240..T_HR_EMPINFO a on e.HNumber = a.FNUMBER
                             join JL20250716203240..T_BD_STAFFTEMP c on c.FID = a.FID
                             join JL20250716203240..T_BD_DEPARTMENT d on c.FDEPTID = d.FDEPTID
                             where e.HItemID ='" + HKeeperID + "' ";
                    //查询质检员对应质检部门
                    ds = oCN.RunProcReturn(sql, "T_HR_EMPINFO");
                    LogService.Write("sql" + sql);
                    if (ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "操作失败,质检员对应质检部门无数据。" + sql;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                //}
                JObject model = new JObject();
@@ -1732,8 +1736,12 @@
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期
                model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //质检组织
                model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //来源组织
                //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门
                //model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员
                                                                                                    //model.Add("FInspectDepId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Dept"].ToString() }); //质检部门
                //if (oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                //{
                    model.Add("FInspectorId", new JObject() { ["Fnumber"] = ds.Tables[0].Rows[0]["Employee"].ToString() }); //质检员
                //}
                model.Add("FISSYNCED", "false");//  æ˜¯å¦å·²åŒæ­¥
                model.Add("F_PGKJ_Date", DateTime.Now.ToString("yyyy-MM-dd"));//  æŠ¥æ£€æ—¥æœŸ
                model.Add("FBillNo", HBillNo);
@@ -1888,7 +1896,15 @@
                        //文件IO流
                        string a = Convert.ToBase64String(buffer);
                        ds = oCN.RunProcReturn("select * from  AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        //if(oSystemParameter.omodel.WMS_CampanyName == "锦隆")
                        //{
                            ds = oCN.RunProcReturn("select * from  JL20250716203240..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        //}
                        //else
                        //{
                        //    ds = oCN.RunProcReturn("select * from  AIS20210811135644..T_QM_INSPECTBILL where FBILLNO='" + HBillNo + "'", "T_QM_INSPECTBILL");
                        //}
                        HInterID = long.Parse(ds.Tables[0].Rows[0]["FID"].ToString());
WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -13700,7 +13700,7 @@
        #endregion
        #region æ·»åº·æ ¹æ®å°è½¦æ¡ç æ‰¾å‡ºç›¸åº”物料
        #endregion
        [Route("WEBSController/GetMaterIDByCarBarCode")]
        [HttpGet]
        public object GetMaterIDByCarBarCode(string CarBarCode)
@@ -13743,5 +13743,6 @@
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/ÎïÁ÷¹ÜÀí/³öÔ˵¥/WLYayBillController.cs
New file
@@ -0,0 +1,551 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers
{
    public class WLYayBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态(新增,修改,浏览,更新单价,变更)
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public DataSet ds1 = new DataSet();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        #region åˆ†é¡µåˆ—表
        [Route("WLYayBillController/GetListPage")]
        [HttpGet]
        public object GetListPage(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_WL_YayBill order by å•据号 desc", "h_v_WL_YayBill");
                }
                else
                {
                    string sql1 = "select * from  h_v_WL_YayBill  where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by å•据号 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_WL_YayBill");
                }
                //添加列名
                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列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region æ ¹æ®æºå•传物料列表
        [Route("WLYayBillController/GetMesByOrginBill")]
        [HttpGet]
        public object GetMesByOrginBill(string ListMaterial)
        {
            try
            {
                if (ListMaterial.EndsWith(";"))
                {
                    ListMaterial = ListMaterial.Remove(ListMaterial.Length - 1);
                }
                ListMaterial = ListMaterial.Replace(';', ',');
                List<object> columnNameList = new List<object>();
                    ds = oCN.RunProcReturn("select a.*,b.HUnitID from h_v_Gy_MaterialPackingRelationList_Edit a left JOIN Gy_Material b on a.HMaterID=b.HItemID where HDefaultSendPackFlag=1 and  HMaterID in (" + ListMaterial+")", "h_v_Gy_MaterialPackingRelationList");
                //添加列名
                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列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region  ä¿å­˜/编辑
        [Route("WLYayBillController/SaveBill")]
        [HttpPost]
        public object SaveBill([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            ListModels oListModels = new ListModels();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsWL_YayBillMain oBill = new DAL.ClsWL_YayBillMain();
                List<Model.ClsWL_YayBillMainBillMain> lsmain = new List<Model.ClsWL_YayBillMainBillMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_WL_YayBillMainMain(msg2);
                foreach (Model.ClsWL_YayBillMainBillMain oItem in lsmain)
                {
                    oItem.HMaker = msg4;
                    DBUtility.ClsPub.CurUserName = msg4;  //制单人
                    oItem.HBillType = "3321";
                    oItem.HBillSubType = "3321";
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HCheckEmp = oItem.HEmpID;
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!没有单据日期,无法保存!";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg3 = msg3.Substring(1, msg3.Length - 2);
                msg3 = msg3.Replace("\\", "");
                msg3 = msg3.Replace("\n", "");  //\n
                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsWL_YayBillMainBillSub> ls = new List<Model.ClsWL_YayBillMainBillSub>();
                ls = oListModels.getObjectByJson_WL_YayBillMainBillSub(msg3);
                int i = 0;
                foreach (Model.ClsWL_YayBillMainBillSub oItem in ls)
                {
                    i++;
                    oItem.HEntryID = i;
                    oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItem.HCloseType = false;   //关闭类型
                    oBill.DetailColl.Add(oItem);
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        #region[编辑时获取数据]
        [Route("WLYayBillController/WL_YayBillDetail")]
        [HttpGet]
        public ApiResult<DataSet> WL_YayBillDetail(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn("select  * from h_v_WL_YayBillEdit  where HInterID= " + HID + " ", "h_v_WL_YayBillEdit");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在单号" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion
        #region å®¡æ ¸ã€åå®¡æ ¸
        /// <summary>
        ///
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("WLYayBillController/AuditWLYayBill")]
        [HttpGet]
        public object AuditWLYayBill(int HInterID, int IsAudit, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败!无权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    if (IsAudit == 0)  //审核判断
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能再次审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //反审核判断
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();
                if (IsAudit == 0)  //审核判断
                {
                    oCN.RunProc("update WL_YayBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() ,HBillStatus=2 where HInterID=" + HInterID);
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "审核成功";
                    objJsonResult.data = null;
                }
                if (IsAudit == 1) //反审核判断
                {
                    oCN.RunProc("update WL_YayBillMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID=" + HInterID);
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "反审核成功";
                    objJsonResult.data = null;
                }
                oCN.Commit();
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ä¾›åº”商确认时间
        /// <summary>
        ///
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("WLYayBillController/ConfrimBillNo")]
        [HttpGet]
        public object ConfrimBillNo(int HInterID, int IsAudit, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败!无权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
                oCN.BeginTran();
                    oCN.RunProc("update WL_YayBillMain set HDate_CarrierSure='" + DateTime.Now.ToString("yyyy-MM-dd") + "' where HInterID=" + HInterID);
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = null;
                oCN.Commit();
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å…¶ä»–确认
        /// <summary>
        ///
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("WLYayBillController/ConfrimOtherBillNo")]
        [HttpGet]
        public object ConfrimOtherBillNo(int HInterID, int IsAudit, string CurUserName)
        {
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败!无权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
                oCN.BeginTran();
                if(IsAudit== 1)
                {
                    oCN.RunProc("update WL_YayBillMain set HSurer_Arrive='" + CurUserName + "',HDate_Arrive=getdate()  where HInterID=" + HInterID);
                }
                else if(IsAudit == 2)
                {
                    oCN.RunProc("update WL_YayBillMain set HSurer_Pick='" + CurUserName + "',HDate_Pick=getdate()  where HInterID=" + HInterID);
                }
                else if(IsAudit == 3)
                {
                    oCN.RunProc("update WL_YayBillMain set HSurer_Trans='" + CurUserName + "',HDate_Trans=getdate()  where HInterID=" + HInterID);
                }
                else if(IsAudit == 4)
                {
                    oCN.RunProc("update WL_YayBillMain set HSurer_Receive='" + CurUserName + "',HDate_Receive=getdate()  where HInterID=" + HInterID);
                }
                else
                {
                    throw new Exception();
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功";
                objJsonResult.data = null;
                oCN.Commit();
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region é€‰æ‹©è½¦è¾†å’Œå¸æœº
        /// <summary>
        ///
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("WLYayBillController/selectDriver")]
        [HttpGet]
        public object selectDriver(int HInterID,int HcheckID, int IsAudit, string CurUserName)
        {
            try
            {
                DataSet ds;
                if(IsAudit==1)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CarList where HItemID=" + HcheckID, "h_v_Gy_CarList");
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        oCN.BeginTran();
                        oCN.RunProc("update WL_YayBillMain set HCarID='" + HcheckID + "' where HInterID=" + HInterID);
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "成功";
                        objJsonResult.data = null;
                        oCN.Commit();
                        return objJsonResult;
                    }
                }
                else
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_driver where HItemID=" + HcheckID, "h_v_Gy_driver");
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        oCN.BeginTran();
                        oCN.RunProc("update WL_YayBillMain set HDriverID='" + HcheckID + "',HDate_AllocationDriver=getdate()  where HInterID=" + HInterID);
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "成功";
                        objJsonResult.data = null;
                        oCN.Commit();
                        return objJsonResult;
                    }
                }
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -101,7 +101,7 @@
                    ",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
                    ",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
                    ", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
                    ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty," +
                    ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor, HMidBoxSize, HVolume, HNetWeight," +
                    "HWeight,HColor,HMaxPOQty,HSubjoin,HEngName) " +
                    " Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -114,7 +114,7 @@
                    oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "'," +
                    oModel.HLength.ToString() + "," + oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + "," +
                   oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + "," +
                    oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() +",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "'" +
                    oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() +",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','" + oModel.HMidBoxSize + "','" + oModel.HVolume + "','" + oModel.HNetWeight + "'" +
                    ",'" + oModel.HWeight + "','" + oModel.HColor + "','" + oModel.HMaxPOQty + "','" + oModel.HSubjoin + "','" + oModel.HEngName + "')");
                oCn.RunProc("Insert into Gy_Material (" +
                    "HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
@@ -128,7 +128,7 @@
                    ",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
                    ",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
                    ", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
                    ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor,HMidBoxSize,HVolume,HNetWeight" +
                    ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor,HMidBoxSize,HVolume,HNetWeight,HCheckEmp" +
                    ",HWeight,HColor,HMaxPOQty,HSubjoin,HEngName) " +
                    " Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -141,7 +141,7 @@
                    oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "',"+
                    oModel.HLength.ToString() + "," +oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + ","+
                   oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + ","+
                    oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','"+ oModel.HMidBoxSize + "','" + oModel.HVolume + "','"+oModel.HNetWeight+"'"+
                    oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','"+ oModel.HMidBoxSize + "','" + oModel.HVolume + "','"+oModel.HNetWeight + "','" + oModel.HCheckEmp + "'"+
                    ",'" + oModel.HWeight + "','" + oModel.HColor + "','" + oModel.HMaxPOQty + "','" + oModel.HSubjoin + "','" + oModel.HEngName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                sql = "set identity_insert gy_material off";
                oCn.RunProc(sql);
WebAPI/ListModels.cs
@@ -711,6 +711,17 @@
            return list;
        }
        /// <summary>
        /// å¤„理运单json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsWL_YayBillMainBillMain> getObjectByJson_WL_YayBillMainMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsWL_YayBillMainBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWL_YayBillMainBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增模具维修子表保养信息的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -745,6 +756,14 @@
            return list;
        }
        
        public List<Model.ClsWL_YayBillMainBillSub> getObjectByJson_WL_YayBillMainBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsWL_YayBillMainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWL_YayBillMainBillSub>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增模具维修验收单主表的json
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <DeleteExistingFiles>False</DeleteExistingFiles>
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\智云MESWMS\API</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,12 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\API</_PublishTargetUrl>
    <History>True|2025-12-29T06:33:00.1237682Z;True|2025-12-29T13:14:37.2747700+08:00;</History>
    <History>True|2026-01-05T15:26:15.9058534Z;True|2026-01-05T23:10:09.2125130+08:00;True|2026-01-05T23:05:18.2406265+08:00;False|2026-01-05T23:04:03.0504675+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>12/29/2025 13:14:16</publishTime>
      <publishTime>01/05/2026 23:04:30</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>12/29/2025 13:14:16</publishTime>
      <publishTime>01/05/2026 23:04:30</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>12/29/2025 13:14:11</publishTime>
      <publishTime>01/05/2026 23:04:27</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>12/29/2025 13:14:11</publishTime>
      <publishTime>01/05/2026 23:04:27</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>12/29/2025 13:14:05</publishTime>
      <publishTime>01/05/2026 23:04:18</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>12/29/2025 13:14:05</publishTime>
      <publishTime>01/05/2026 23:04:18</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>12/29/2025 13:14:09</publishTime>
      <publishTime>01/05/2026 23:04:19</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>12/29/2025 13:14:09</publishTime>
      <publishTime>01/05/2026 23:04:19</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>12/29/2025 13:14:01</publishTime>
      <publishTime>01/05/2026 23:04:14</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>12/29/2025 13:14:01</publishTime>
      <publishTime>01/05/2026 23:04:14</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>12/29/2025 13:14:03</publishTime>
      <publishTime>01/05/2026 23:04:16</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>12/29/2025 13:14:03</publishTime>
      <publishTime>01/05/2026 23:04:16</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>12/29/2025 13:14:03</publishTime>
      <publishTime>01/05/2026 23:04:16</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>12/29/2025 13:14:03</publishTime>
      <publishTime>01/05/2026 23:04:16</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>12/29/2025 09:20:32</publishTime>
      <publishTime>01/05/2026 23:04:11</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>12/29/2025 09:20:32</publishTime>
      <publishTime>01/05/2026 23:04:11</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +252,7 @@
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,22 +285,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>12/29/2025 09:20:32</publishTime>
      <publishTime>01/05/2026 23:04:20</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>12/29/2025 09:20:32</publishTime>
      <publishTime>01/05/2026 23:04:20</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>12/29/2025 14:32:51</publishTime>
      <publishTime>01/05/2026 23:09:51</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>12/29/2025 14:32:51</publishTime>
      <publishTime>01/05/2026 23:09:51</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>12/29/2025 14:32:55</publishTime>
      <publishTime>01/05/2026 23:10:04</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -312,61 +312,61 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:15</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:15</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:15</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:15</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/Interop.grsvr6Lib.dll">
      <publishTime>12/15/2025 08:04:16</publishTime>
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>08/18/2025 16:11:19</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>08/18/2025 16:11:19</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>08/18/2025 16:11:19</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>08/18/2025 16:11:19</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -375,7 +375,7 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -384,127 +384,127 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>08/18/2025 16:11:19</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>12/29/2025 09:21:08</publishTime>
      <publishTime>12/29/2025 09:02:47</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/08/2025 10:29:30</publishTime>
      <publishTime>12/07/2025 12:01:10</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>09/12/2025 10:51:38</publishTime>
      <publishTime>08/29/2025 09:43:09</publishTime>
    </File>
    <File Include="Utility/Barcode.ashx">
      <publishTime>12/15/2025 08:04:16</publishTime>
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>08/18/2025 16:11:18</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>10/27/2025 08:51:29</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>10/27/2025 08:51:29</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>10/27/2025 08:51:29</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>10/27/2025 08:51:30</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>10/27/2025 08:51:29</publishTime>
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>12/29/2025 13:14:35</publishTime>
      <publishTime>01/05/2026 23:05:15</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml
New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
此文件由 Web é¡¹ç›®çš„发布/打包过程使用。可以通过编辑此 MSBuild æ–‡ä»¶
自定义此过程的行为。为了解与此相关的更多内容,请访问 https://go.microsoft.com/fwlink/?LinkID=208121。
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
@@ -93,7 +93,7 @@
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -117,7 +117,7 @@
      <publishTime>01/06/2026 10:52:46</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
@@ -252,7 +252,7 @@
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -312,61 +312,61 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>04/06/2023 15:57:01</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Interop.grsvr6Lib.dll">
      <publishTime>01/04/2026 18:33:49</publishTime>
      <publishTime>12/16/2025 16:29:36</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -375,7 +375,7 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -384,124 +384,124 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>07/12/2023 08:14:21</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/04/2026 18:33:49</publishTime>
      <publishTime>12/30/2025 14:17:55</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/08/2025 16:05:47</publishTime>
      <publishTime>12/10/2025 17:08:59</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>09/01/2025 08:23:20</publishTime>
      <publishTime>09/05/2025 16:16:48</publishTime>
    </File>
    <File Include="Utility/Barcode.ashx">
      <publishTime>01/04/2026 18:33:49</publishTime>
      <publishTime>12/16/2025 16:29:36</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>05/23/2025 10:00:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:36</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>04/06/2023 15:57:02</publishTime>
      <publishTime>08/21/2025 15:39:37</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>01/06/2026 10:53:28</publishTime>
WebAPI/Utility/Barcode.ashx.cs
@@ -1,6 +1,6 @@
using System;
using System.Web;
//using grsvr6Lib;
using grsvr6Lib;
namespace GridReport.html5
{
WebAPI/Web.config
@@ -35,12 +35,12 @@
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>-->  <!--测试服务器-->
        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    --><!--本地-->
        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->
        <add key="surl" value="http://localhost/WEBS-WMS/webservice1.asmx" /> <!--翁涛涛本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--翁涛涛本地配置-->
        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        <!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />三升本地配置-->
        <!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />-->    <!--金帅-->
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />-->
        <add key="sUrl" value="http://localhost:81/MESWMS-WEBS/WebService1.asmx" />
        
        <add key="webpages:Version" value="3.0.0.0" />
        <add key="webpages:Enabled" value="false" />
@@ -109,13 +109,13 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://localhost/WEBS-WMS/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
            <endpoint address="http://localhost:81/MESWMS-WEBS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
        </client>
    </system.serviceModel>
 <applicationSettings>
  <WebAPI.Properties.Settings>
   <setting name="WebAPI_WebS_WebService1" serializeAs="String">
    <value>http://localhost/WEBS-WMS/webservice1.asmx</value>
    <value>http://localhost:81/MESWMS-WEBS/WebService1.asmx</value>
   </setting>
  </WebAPI.Properties.Settings>
 </applicationSettings>
WebAPI/WebAPI.csproj
@@ -467,6 +467,7 @@
    <Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
    <Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
    <Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
    <Compile Include="Controllers\QC_InStockCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
@@ -670,6 +671,7 @@
    <Compile Include="Controllers\基础资料\基础资料\Gy_PNLInfoTypeLevelController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_ShelfLifeNearExpiryController.cs" />
    <Compile Include="Controllers\检验申请单\QC_RequestCheckBillController.cs" />
    <Compile Include="Controllers\物流管理\出运单\WLYayBillController.cs" />
    <Compile Include="Controllers\项目管理\工程项目\PM_ProjectBill_WorkController.cs" />
    <Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
    <Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
WebAPI/WebAPI.csproj.user
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
@@ -11,16 +9,32 @@
    <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
    <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
    <UseGlobalApplicationHostFile />
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
    <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
    <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
    <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <ProjectView>ProjectFiles</ProjectView>
  </PropertyGroup>
  <ProjectExtensions />
  <ProjectExtensions>
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
          <SQLDebugging>False</SQLDebugging>
          <ExternalProgram>
          </ExternalProgram>
          <StartExternalURL>
          </StartExternalURL>
          <StartCmdLineArguments>
          </StartCmdLineArguments>
          <StartWorkingDirectory>
          </StartWorkingDirectory>
          <EnableENC>True</EnableENC>
          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
        </WebProjectProperties>
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
</Project>
sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,19 @@
<<<<<<< HEAD
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
=======
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
>>>>>>> 17752a6ca5434cac875b98272c9bc7534ae4a059
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
New file
@@ -0,0 +1 @@
eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
New file
@@ -0,0 +1,5 @@
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ