1
chenhaozhe
6 天以前 30f332f62156d0e3460ed20a4865911f9a1912e6
1
86个文件已修改
5个文件已添加
1324 ■■■■■ 已修改文件
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/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 | 历史
DAL/采购管理/ClsCg_OrderTransportBill_Ctl.cs 146 ●●●●● 补丁 | 查看 | 原始文档 | 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.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | 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.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/采购管理/ClsCg_OrderTransportBillSub_Model.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/采购管理/ClsCg_OrderTransportBillSub_Money_Model.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/采购管理/ClsCg_OrderTransportBill_Model.cs 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/bin/Release/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/bin/Release/Pub_Class.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.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | 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/obj/Debug/SyntacticSugar.dll 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Debug/SyntacticSugar.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs 926 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/条码管理/WEBSController.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | 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/DAL.csproj
@@ -746,6 +746,7 @@
    <Compile Include="采购管理\ClsCg_InvoiceSpecBill.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="采购管理\ClsCg_OrderTransportBill_Ctl.cs" />
    <Compile Include="采购管理\ClsCg_POInStockBackBill.cs">
      <SubType>Code</SubType>
    </Compile>
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
DAL/²É¹º¹ÜÀí/ClsCg_OrderTransportBill_Ctl.cs
New file
@@ -0,0 +1,146 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DBUtility;
namespace DAL
{
    public class ClsCg_OrderTransportBill_Ctl : ClsXt_BaseBill
    {
        public ClsCg_OrderTransportBill_Ctl()
        {
            base.MvarItemKeySub = "ClsCg_OrderTransportBillSub";
            base.MvarItemKeySub2 = "ClsCg_OrderTransportBillSub_Money";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
            base.MvarItemKey = "ClsCg_OrderTransportBillMain";
            base.MvarReportTitle = "运单申请";
            base.BillType = "1118";
            base.HBillSubType = "1118";
        }
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public string HOldNumber;
        public Model.ClsCg_OrderTransportBill_Model oModel = new Model.ClsCg_OrderTransportBill_Model();
        public Model.ClsCg_OrderTransportBillSub_Model oModel_Sub = new Model.ClsCg_OrderTransportBillSub_Model();
        public Model.ClsCg_OrderTransportBillSub_Money_Model oModel_Sub_Money = new Model.ClsCg_OrderTransportBillSub_Money_Model();
        public override bool DeleteBill(long lngBillKey, ref string sReturn)
        {
            return base.DeleteBill(lngBillKey, ref sReturn);
        }
        public override bool IsExistMainID(ref string sReturn, long lngBillKey, Pub_Class.ClsPub.Enum_BillStatus oBillStatus)
        {
            return base.IsExistMainID(ref sReturn, lngBillKey, oBillStatus);
        }
        public override bool IsExistBillNo(ref string sReturn, string sBillNo, Pub_Class.ClsPub.Enum_BillStatus oBillStatus, long lngBillKey)
        {
            return base.IsExistBillNo(ref sReturn, sBillNo, oBillStatus, lngBillKey);
        }
        public override bool ModifyBill(long lngBillKey, ref string sReturn)
        {
            return base.ModifyBill(lngBillKey, ref sReturn);
        }
        public override bool AddBill(ref string sReturn)
        {
            bool success = false;
            // æ·»åŠ ä¸»è¡¨
            string sql = $@" Insert Into {MvarItemKey}
            INSERT INTO BillMain (
            HYear, HPeriod, HBillType, HBillSubType, HInterID, 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, HItemMainID, HCusID, HStockOutBillMainID, HStockOutBillNo,
            HSupID, HOrderBillNumber, HOrderType, HTransportType, HTransportMoney, HSendAddr,
            HReceAddr, HGoodsVolume, HTakeGoodsTime, HArriveGoodsTime, HCarID, HDriverID,
            HLoadRate, HOrderStatus
            ) VALUES (
            {oModel.HYear}, {oModel.HPeriod}, '{oModel.HBillType}', '{oModel.HBillSubType}', {oModel.HInterID}, '{oModel.HDate}', '{oModel.HBillNo}', {oModel.HBillStatus},
            {oModel.HCheckItemNowID}, {oModel.HCheckItemNextID}, {oModel.HCheckFlowID}, '{oModel.HRemark}', '{oModel.HBacker}', '{oModel.HBackDate}', '{oModel.HBackRemark}',
            '{oModel.HChecker}', '{oModel.HCheckDate}', '{oModel.HMaker}', '{oModel.HMakeDate}', '{oModel.HUpDater}', '{oModel.HUpDateDate}', '{oModel.HCloseMan}', '{oModel.HCloseDate}',
            {oModel.HCloseType}, '{oModel.HDeleteMan}', '{oModel.HDeleteDate}', '{oModel.HMainSourceBillType}', {oModel.HMainSourceInterID}, {oModel.HMainSourceEntryID},
            '{oModel.HMainSourceBillNo}', {oModel.HPrintQty}, {oModel.HItemMainID}, {oModel.HCusID}, {oModel.HStockOutBillMainID}, '{oModel.HStockOutBillNo}',
            {oModel.HSupID}, '{oModel.HOrderBillNumber}', '{oModel.HOrderType}', '{oModel.HTransportType}', {oModel.HTransportMoney}, '{oModel.HSendAddr}',
            '{oModel.HReceAddr}', {oModel.HGoodsVolume}, '{oModel.HTakeGoodsTime}', '{oModel.HArriveGoodsTime}', {oModel.HCarID}, {oModel.HDriverID},
            {oModel.HLoadRate}, {oModel.HOrderStatus}
            ";
            oCn.RunProc(sql);
            // æ·»åŠ å­è¡¨
            success = AddBillSub(ref DBUtility.ClsPub.sExeReturnInfo);
            // æ·»åŠ å­è¡¨-金额
            success = AddBillSub_Money(ref DBUtility.ClsPub.sExeReturnInfo);
            return success;
        }
        public override bool ShowBill(long lngBillKey, ref string sReturn)
        {
            return base.ShowBill(lngBillKey, ref sReturn);
        }
        public override void DeleteRelation(ref string sReturn, long lngBillKey)
        {
            base.DeleteRelation(ref sReturn, lngBillKey);
        }
        public override void AddNewRelation(ref string sReturn, long lngBillKey)
        {
            base.AddNewRelation(ref sReturn, lngBillKey);
        }
        // æ·»åŠ å­å•æ®
        public bool AddBillSub(ref string sReturn)
        {
            string sql = $@"
            INSERT INTO {MvarItemKeySub} (
                HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType,
                HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType,
                HRelationQty, HRelationMoney, HItemSubID, HMaterID, HVolume, HPack, HUnitID
            ) VALUES (
                {oModel_Sub.HInterID}, '{oModel_Sub.HBillNo_bak}', {oModel_Sub.HEntryID},
                '{oModel_Sub.HCloseMan}', '{oModel_Sub.HEntryCloseDate}', {oModel_Sub.HCloseType},
                '{oModel_Sub.HRemark}', {oModel_Sub.HSourceInterID}, {oModel_Sub.HSourceEntryID},
                '{oModel_Sub.HSourceBillNo}', '{oModel_Sub.HSourceBillType}', {oModel_Sub.HRelationQty},
                '{oModel_Sub.HRelationMoney}', {oModel_Sub.HItemSubID}, {oModel_Sub.HMaterID},
                {oModel_Sub.HVolume}, '{oModel_Sub.HPack}', {oModel_Sub.HUnitID}
            )
            ";
            oCn.RunProc(sql);
            return true;
        }
        // æ·»åŠ å­å•æ® è´¹ç”¨
        public bool AddBillSub_Money(ref string sReturn)
        {
            string sql = $@"
            INSERT INTO {MvarItemKeySub} (
                HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType,
                HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType,
                HRelationQty, HRelationMoney, HItemSubID, HMaterID, HVolume, HPack, HUnitID
            ) VALUES (
                {oModel_Sub.HInterID}, '{oModel_Sub.HBillNo_bak}', {oModel_Sub.HEntryID},
                '{oModel_Sub.HCloseMan}', '{oModel_Sub.HEntryCloseDate}', {oModel_Sub.HCloseType},
                '{oModel_Sub.HRemark}', {oModel_Sub.HSourceInterID}, {oModel_Sub.HSourceEntryID},
                '{oModel_Sub.HSourceBillNo}', '{oModel_Sub.HSourceBillType}', {oModel_Sub.HRelationQty},
                '{oModel_Sub.HRelationMoney}', {oModel_Sub.HItemSubID}, {oModel_Sub.HMaterID},
                {oModel_Sub.HVolume}, '{oModel_Sub.HPack}', {oModel_Sub.HUnitID}
            )
            ";
            oCn.RunProc(sql);
            return true;
        }
    }
}
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.csproj.AssemblyReference.cache
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
DBUtility/obj/Release/DBUtility.dll
Binary files differ
DBUtility/obj/Release/DBUtility.pdb
Binary files differ
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
Model/Model.csproj
@@ -946,6 +946,9 @@
    <Compile Include="采购管理\ClsCg_InvoiceSpecBillSub.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="采购管理\ClsCg_OrderTransportBillSub_Model.cs" />
    <Compile Include="采购管理\ClsCg_OrderTransportBillSub_Money_Model.cs" />
    <Compile Include="采购管理\ClsCg_OrderTransportBill_Model.cs" />
    <Compile Include="采购管理\ClsCg_POInStockBackBillMain.cs">
      <SubType>Code</SubType>
    </Compile>
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.csproj.AssemblyReference.cache
Binary files differ
Model/obj/Release/Model.dll
Binary files differ
Model/obj/Release/Model.pdb
Binary files differ
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
Model/²É¹º¹ÜÀí/ClsCg_OrderTransportBillSub_Model.cs
New file
@@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using DBUtility;
namespace Model
{
    public class ClsCg_OrderTransportBillSub_Model : ClsGy_Base_Model
    {
        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; }
        public int? HSourceEntryID { get; set; }
        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 decimal? HVolume { get; set; }
        public string HPack { get; set; }
        public int? HUnitID { get; set; }
    }
}
Model/²É¹º¹ÜÀí/ClsCg_OrderTransportBillSub_Money_Model.cs
New file
@@ -0,0 +1,29 @@
using DBUtility;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Model
{
    public class ClsCg_OrderTransportBillSub_Money_Model : ClsGy_Base_Model
    {
        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; }
        public int? HSourceEntryID { get; set; }
        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? HMoneysItemID { get; set; }
        public decimal? HMoneys { get; set; }
        public string HPic { get; set; }
        public DateTime? HLoadTime { get; set; }
    }
}
Model/²É¹º¹ÜÀí/ClsCg_OrderTransportBill_Model.cs
New file
@@ -0,0 +1,60 @@
using DBUtility;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Model
{
    public class ClsCg_OrderTransportBill_Model : ClsGy_Base_Model
    {
        public int HYear { get; set; }
        public int HPeriod { get; set; }
        public string HBillType { get; set; }
        public string HBillSubType { get; set; }
        public int HInterID { get; set; }
        public DateTime HDate { get; set; }
        public string HBillNo { get; set; }
        public int HBillStatus { get; set; }
        public int HCheckItemNowID { get; set; }
        public int HCheckItemNextID { get; set; }
        public int HCheckFlowID { get; set; }
        public string HRemark { get; set; }
        public string HBacker { get; set; }
        public DateTime? HBackDate { get; set; }
        public string HBackRemark { get; set; }
        public string HChecker { get; set; }
        public DateTime? HCheckDate { get; set; }
        public string HMaker { get; set; }
        public DateTime HMakeDate { get; set; }
        public string HUpDater { get; set; }
        public DateTime? HUpDateDate { get; set; }
        public string HCloseMan { get; set; }
        public DateTime? HCloseDate { get; set; }
        public bool HCloseType { get; set; }
        public string HDeleteMan { get; set; }
        public DateTime? HDeleteDate { get; set; }
        public string HMainSourceBillType { get; set; }
        public int? HMainSourceInterID { get; set; }
        public int? HMainSourceEntryID { get; set; }
        public string HMainSourceBillNo { get; set; }
        public int HPrintQty { get; set; }
        public int HItemMainID { get; set; }
        public int? HCusID { get; set; }
        public int? HStockOutBillMainID { get; set; }
        public string HStockOutBillNo { get; set; }
        public int? HSupID { get; set; }
        public string HOrderBillNumber { get; set; }
        public string HOrderType { get; set; }
        public string HTransportType { get; set; }
        public decimal? HTransportMoney { get; set; }
        public string HSendAddr { get; set; }
        public string HReceAddr { get; set; }
        public decimal? HGoodsVolume { get; set; }
        public DateTime? HTakeGoodsTime { get; set; }
        public DateTime? HArriveGoodsTime { get; set; }
        public int? HCarID { get; set; }
        public int? HDriverID { get; set; }
        public decimal? HLoadRate { get; set; }
        public int HOrderStatus { get; set; }
    }
}
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
Pub_Class/bin/Release/Pub_Class.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.csproj.AssemblyReference.cache
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/obj/Debug/SyntacticSugar.dll
Binary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs
New file
@@ -0,0 +1,926 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Service;
namespace WebAPI.Controllers
{
    public class Cg_OrderTransportBillListController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        /// <summary>
        /// è¿”回运单申请列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Cg_OrderTransportBill/list")]
        [HttpGet]
        public object list(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_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_Cg_OrderTransportBillList where 1=1 order by hmainid  ", "h_v_Cg_OrderTransportBillList");
                }
                else
                {
                    string sql1 = "select * from h_v_Cg_OrderTransportBillList where 1=1 ";
                    string sql = sql1 + sWhere + " order by hmainid";
                    ds = oCN.RunProcReturn(sql, "h_v_Cg_OrderTransportBillList");
                }
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #region è¿å•申请列表-分页
        [Route("Cg_OrderTransportBill/list_byPage")]
        [HttpGet]
        public object GetCarList_byPage(string sWhere, string user, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();  //定义声明变量 ï¼ŒæŠŠé€šè¿‡ new List<object>()创建的 å®žä¾‹ï¼Œèµ‹å€¼ç»™å˜é‡
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_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("exec h_p_Cg_OrderTransportBillListPage " + page + "," + size + "," + "''", "h_p_Cg_OrderTransportBillList");
                }
                else
                {
                    sWhere = sWhere.Replace("'", "''");
                    ds = oCN.RunProcReturn("exec h_p_Cg_OrderTransportBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Cg_OrderTransportBillList");
                }
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.list = columnNameList;
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "没有返回任何记录!";
                objJsonResult.list = columnNameList;
                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 ä¿å­˜ è¿å•申请信息
        /// <summary>
        /// ä¿å­˜è¿å•申请信息
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Cg_OrderTransportBill/SaveCg_OrderTransportBill")]
        [HttpPost]
        public object SaveCg_OrderTransportBill([FromBody] JObject msg)
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            string oprType = sArray[2].ToString();
            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            //获取最大ID值赋值
            // DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Cg_OrderTransportBill ", "Cg_OrderTransportBill");
            // if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
            // {
            //     var maxid = 0;
            //     if (Maxds.Tables[0].Rows[0]["HItemID"] != DBNull.Value)
            //     {
            //         //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
            //         maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
            //         maxid += 1;
            //     }
            //
            //     HItemID = maxid;
            // }
            ListModels oListModels = new ListModels();
            try
            {
                DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
                List<Model.ClsCg_OrderTransportBill_Model> lsmain = new List<Model.ClsCg_OrderTransportBill_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Cg_OrderTransportBill(msg1);
                foreach (Model.ClsCg_OrderTransportBill_Model oItem in lsmain)
                {
                    //新增时判断
                    if (oprType == "1" || oprType == "2")
                    {
                        oItem.HMaker = msg2;//创建人
                    }
                    else if(oprType == "3")//编辑时判断
                    {
                        //已审核不允许修改
                        DataSet dss;
                        dss = oCN.RunProcReturn("select * from Cg_OrderTransportBill where HItemID=" + oItem.HItemID, "Cg_OrderTransportBill");
                        //判断是否可编辑
                        if (dss.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据状态已经审核,不允许修改!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    oBill.oModel = oItem;
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oprType == "1" || oprType == "2")
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else if(oprType == "3")
                {
                    oBill.oModel.HModifyEmp = msg2;
                    bResult = oBill.ModifyBill(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    throw new Exception("该单据为浏览状态,不可保存");
                }
                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 è¿å•申请审核、反审核
        /// <summary>
        ///
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">审核(0),反审核(1)</param>
        /// <param name="CurUserName">审核人</param>
        /// <returns></returns>
        [Route("Cg_OrderTransportBill/AuditCg_OrderTransportBill")]
        [HttpGet]
        public object AuditCg_OrderTransportBill(int HInterID, int IsAudit, string CurUserName)
        {
            DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
            string sReturn = "";
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log_second("Cg_OrderTransportBill_Check", 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败!无权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var ds = oCN.RunProcReturn("select * from Cg_OrderTransportBillMain where HItemID=" + HInterID, "Cg_OrderTransportBill");
                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)  //审核判断
                {
                    //审核前控制=========================================
                    string sql1 = "exec h_p_Cg_OrderTransportBill_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_Cg_OrderTransportBill_BeforeCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:审核前判断失败,请与网络管理人员联系";
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    //==================================================================================
                    oBill.CheckBill(HInterID, ref sReturn);
                    //审核后控制=========================================
                    string sql2 = "exec h_p_Cg_OrderTransportBill_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql2, "h_p_Cg_OrderTransportBill_AfterCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:审核后判断失败,请与网络管理人员联系";
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    //==================================================================================
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "审核成功";
                    objJsonResult.data = null;
                }
                if (IsAudit == 1) //反审核判断
                {
                    //反审核前控制=========================================
                    string sql1 = "exec h_p_Cg_OrderTransportBill_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql1, "h_p_Cg_OrderTransportBill_BeforeCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核失败!原因:反审核前判断失败,请与网络管理人员联系";
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    //==================================================================================
                    oBill.AbandonCheck(HInterID, ref sReturn);
                    //反审核后控制=========================================
                    string sql2 = "exec h_p_Cg_OrderTransportBill_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
                    ds = oCN.RunProcReturn(sql2, "h_p_Cg_OrderTransportBill_AfterUnCheckCtrl");
                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核失败!原因:反审核后判断失败,请与网络管理人员联系";
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                    //==================================================================================
                    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  è¿å•申请单 ä½œåºŸ/反作废功能
        [Route("Cg_OrderTransportBill/DropCg_OrderTransportBill")]
        [HttpGet]
        public object DropCg_OrderTransportBill(string HInterID, int Type, string user)
        {
            DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
            try
            {
                //判断是否有作废权限
                if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限作废!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ClsPub.CurUserName = user;
                oCN.BeginTran();//开始事务
                //Type 1 ä½œåºŸ  2  åä½œåºŸ
                if (Type == 1)
                {
                    //判断单据是否已经作废
                    DataSet ds;
                    string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不需要再作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据在审核中!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //作废单据
                        if (!oBill.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反作废
                    DataSet ds;
                    string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已审核!不能进行作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未作废!不需要再反作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据在审核中!不能进行反作废!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反作废单据
                        if (!oBill.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反作废失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                oCN.Commit();//提交事务
                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("Cg_OrderTransportBill/CloseCg_OrderTransportBill")]
        [HttpGet]
        public object CloseCg_OrderTransportBill(string HInterID, int Type, string user)
        {
            DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
            try
            {
                //判断是否有删除权限
                if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Close", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限关闭!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ClsPub.CurUserName = user;
                oBill.MvarItemKey = "Cg_OrderTransportBillMain";
                oCN.BeginTran();//开始事务
                //Type 1 å…³é—­  2  åå…³é—­
                if (Type == 1)
                {
                    //判断单据是否已经关闭
                    DataSet ds;
                    string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已关闭!不能再次关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //关闭单据
                        if (!oBill.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    //判断单据是否已经反关闭
                    DataSet ds;
                    string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据已作废!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不能进行关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未关闭!不需要再反关闭!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反关闭单据
                        if (!oBill.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反关闭失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                oCN.Commit();//提交事务
                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("Cg_OrderTransportBill/GetCg_OrderTransportBillDetail")]
        [HttpGet]
        public object GetCg_OrderTransportBillDetail(int HID)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = $@"select * from h_v_Cg_OrderTransportBillList where HItemID = {HID}";
                ds = oCN.RunProcReturn(sql1, "h_v_Cg_OrderTransportBillList");
                //添加列名
                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 e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è¿å•申请文件上传
        [Route("Cg_OrderTransportBill/Cg_OrderTransportBill_UploadFile")]
        [HttpPost]
        public object Cg_OrderTransportBill_UploadFile()
        {
            string HBillNo = HttpContext.Current.Request.Params["HBillNo"];  //车牌号
            string HUserName = HttpContext.Current.Request.Params["HUserName"];  //创建人
            HttpPostedFile files = HttpContext.Current.Request.Files["file"];
            string path = HttpContext.Current.Server.MapPath("~/../Files/Cg_OrderTransportBill/" + HBillNo);
            dynamic dyResult = UpLoadFile(files, path, HBillNo, HUserName);
            if (dyResult != null && dyResult.result == 1)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "上传成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = dyResult.returnval;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HUserName)
        {
            dynamic Result_Ob = new { result = 1, returnval = "上传成功!" };
            string filePath = Path.GetFullPath(files.FileName);//文件上传路径
            string fileExtension = Path.GetExtension(files.FileName);// æ–‡ä»¶æ‰©å±•名
            string filename = files.FileName;//文件名
            string fileSavePath = path;// ä¸Šä¼ ä¿å­˜è·¯å¾„
            int filesize = files.ContentLength;//获取上传文件的大小单位为字节byte
            int Maxsize = 40000 * 1024;//定义上传文件的最大空间大小为40M
            try
            {
                if (files == null || files.ContentLength <= 0)
                {
                    Result_Ob = new { result = 0, returnval = "文件不能为空!" };
                    return Result_Ob;
                }
                if (filesize >= Maxsize)
                {
                    Result_Ob = new { result = 0, returnval = "上传文件超过40M,不能上传!" };
                    return Result_Ob;
                }
                string fileurl = Path.Combine(fileSavePath, filename);
                if (Directory.Exists(fileurl) == true)  //如果存在重名文件就提示
                {
                    Result_Ob = new { result = 0, returnval = "存在同名文件!" };
                    return Result_Ob;
                }
                //删除数据表数据
                ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
                if (Directory.Exists(path))
                {
                    File.Delete(fileurl);      //删除指定文件
                    files.SaveAs(fileurl);
                    string StrPath = "/files/Cg_OrderTransportBill/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作,比如更新数据库
                        //写入数据表
                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
                                    ",HFileClsID,HSourceBillNo" +
                                   ") values('"
                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
                                    ",'" + HUserName + "',getdate(),'','V1','" + filesize +
                                    "','" + 0 + "','" + HBillNo +
                                   "') ");
                    }
                    else
                    {
                        Result_Ob = new { result = 0, returnval = "上传失败!此文件为恶意文件" };
                    }
                }
                else
                {
                    Directory.CreateDirectory(fileSavePath); //添加文件夹
                    files.SaveAs(fileurl);
                    string StrPath = "/files/Cg_OrderTransportBill/" + HBillNo + "/" + filename;
                    if (File.Exists(fileurl))
                    {
                        //这里可以执行一些其它的操作,比如更新数据库
                        //写入数据表
                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
                                    ",HFileClsID,HSourceBillNo" +
                                   ") values('"
                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
                                    ",'" + HUserName + "',getdate(),'','V1','" + filesize +
                                    "','" + 0 + "','" + HBillNo +
                                   "') ");
                    }
                    else
                    {
                        Result_Ob = new { result = 0, returnval = "上传失败!此文件为恶意文件" };
                    }
                }
            }
            catch (Exception e)
            {
                Result_Ob = new { result = 0, returnval = e.Message };
            }
            return Result_Ob;
        }
    }
}
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs
@@ -304,7 +304,7 @@
        }
        #endregion
        #region [通过源单类型查找不同单据信息]
        #region [通过源单类型查找不同单据信息] ä½¿ç”¨æ–°çš„分页方式
        [Route("Sc_BarCode/ReportFromBillList_New")]
        [HttpGet]
        public object ReportFromBillList_New(int page, int limit, string sWhere, string HSouceBillType, string HOrgID)
WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -13202,6 +13202,7 @@
        }
        #endregion
        #region è½¬ç§»æ¨¡å—
        //转移模块
        [Route("WEBSController/CheckHW")]
        [HttpGet]
@@ -13247,6 +13248,7 @@
                return objJsonResult;
            }
        }
        #endregion
       #region æƒ åº· ç”Ÿäº§é¢†æ–™å•校验 æ‰«ææºå• èŽ·å–ç”Ÿäº§é¢†æ–™å•å’Œä¸‹æ¸¸é¢†æ–™å•æœªå®¡æ ¸ å•据
        [Route("WEBSController/get_BillBarCode_BillCheck_Json_MateOut_HuiKang")]
@@ -13360,5 +13362,30 @@
        #endregion
        #region æ£€éªŒå• æ‰«ææºå• æ ¹æ®å•据类型 æºå•类型 æºå•号 è§£æžå¹¶è¿”回检验项目
        [Route("WEBSController/get_BillBarCode_Json_CheckItem")]
        [HttpGet]
        public Object get_BillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HSourceBillNo)
        {
            try
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "success!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫描单据条码失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/ListModels.cs
@@ -5244,5 +5244,42 @@
            List<ClsWW_EntrustOrderBillMain_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsWW_EntrustOrderBillMain_1>>(jsonString);
            return list;
        }
        /// <summary>
        /// è¿å•申请 ä¸»è¡¨
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<ClsCg_OrderTransportBill_Model> getObjectByJson_Cg_OrderTransportBill(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<ClsCg_OrderTransportBill_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBill_Model>>(jsonString);
            return list;
        }
        /// <summary>
        /// è¿å•申请 å­è¡¨
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<ClsCg_OrderTransportBillSub_Model> getObjectByJson_Cg_OrderTransportBill_Sub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<ClsCg_OrderTransportBillSub_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Model>>(jsonString);
            return list;
        }
        /// <summary>
        /// è¿å•申请 å­è¡¨ Money
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<ClsCg_OrderTransportBillSub_Money_Model> getObjectByJson_Cg_OrderTransportBill_SubMoney(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<ClsCg_OrderTransportBillSub_Money_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Money_Model>>(jsonString);
            return list;
        }
    }
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\gz\网站发布\MES-WEB-TM</_PublishTargetUrl>
    <History>False|2025-12-14T11:49:03.3551714Z;True|2025-12-09T08:45:50.1203655+08:00;True|2025-12-09T08:21:11.0727775+08:00;</History>
    <History>False|2025-12-14T13:30:46.1937966Z;False|2025-12-14T19:49:03.3551714+08:00;True|2025-12-09T08:45:50.1203655+08:00;True|2025-12-09T08:21:11.0727775+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2025-08-13T05:32:18.1126471Z;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
    <History>True|2025-12-16T08:18:59.7366636Z;False|2025-12-16T16:18:08.0149952+08:00;True|2025-12-16T10:46:52.7815645+08:00;True|2025-12-16T10:32:25.9340809+08:00;True|2025-12-16T10:23:58.5183174+08:00;False|2025-12-16T10:23:06.1859498+08:00;True|2025-12-15T08:06:12.6833489+08:00;False|2025-12-15T08:05:23.3449223+08:00;True|2025-12-14T21:32:50.6557670+08:00;True|2025-08-13T13:32:18.1126471+08:00;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/08/2025 13:13:07</publishTime>
      <publishTime>12/16/2025 10:23:25</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/08/2025 13:13:07</publishTime>
      <publishTime>12/16/2025 10:23:25</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/08/2025 13:13:05</publishTime>
      <publishTime>12/16/2025 10:23:21</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/08/2025 13:13:05</publishTime>
      <publishTime>12/16/2025 10:23:21</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/08/2025 13:13:01</publishTime>
      <publishTime>12/14/2025 21:30:55</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/08/2025 13:13:01</publishTime>
      <publishTime>12/14/2025 21:30:55</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/08/2025 13:13:02</publishTime>
      <publishTime>12/16/2025 10:23:16</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/08/2025 13:13:02</publishTime>
      <publishTime>12/16/2025 10:23:16</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/21/2025 11:46:16</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/08/2025 13:12:59</publishTime>
      <publishTime>12/14/2025 21:30:53</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/08/2025 13:12:59</publishTime>
      <publishTime>12/14/2025 21:30:53</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/08/2025 13:13:00</publishTime>
      <publishTime>12/14/2025 21:30:54</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/08/2025 13:13:00</publishTime>
      <publishTime>12/14/2025 21:30:54</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/08/2025 13:13:00</publishTime>
      <publishTime>12/14/2025 21:30:54</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/08/2025 13:13:00</publishTime>
      <publishTime>12/14/2025 21:30:54</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>08/08/2025 10:08:01</publishTime>
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>08/08/2025 10:08:01</publishTime>
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/08/2025 12:29:49</publishTime>
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/08/2025 12:29:52</publishTime>
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/13/2025 13:31:56</publishTime>
      <publishTime>12/16/2025 16:18:41</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/13/2025 13:31:56</publishTime>
      <publishTime>12/16/2025 16:18:41</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/13/2025 13:32:16</publishTime>
      <publishTime>12/16/2025 16:18:58</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -331,6 +331,9 @@
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>04/21/2025 11:46:16</publishTime>
    </File>
    <File Include="DLL/Interop.grsvr6Lib.dll">
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/21/2025 11:46:16</publishTime>
@@ -388,6 +391,15 @@
    </File>
    <File Include="packages.config">
      <publishTime>04/21/2025 11:46:17</publishTime>
    </File>
    <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
      <publishTime>12/07/2025 12:01:10</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>08/29/2025 09:43:09</publishTime>
    </File>
    <File Include="Utility/Barcode.ashx">
      <publishTime>12/14/2025 21:28:19</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/21/2025 11:46:17</publishTime>
@@ -495,7 +507,7 @@
      <publishTime>05/06/2024 13:47:57</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/13/2025 09:59:38</publishTime>
      <publishTime>12/14/2025 21:32:49</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj
@@ -272,6 +272,7 @@
    <Content Include="DLL\BLL.dll" />
    <Content Include="DLL\DAL.dll" />
    <Content Include="DLL\DBUtility.dll" />
    <Content Include="DLL\Interop.grsvr6Lib.dll" />
    <Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" />
    <Content Include="DLL\Model.dll" />
    <Content Include="DLL\Newtonsoft.Json.Net35.dll" />
@@ -429,6 +430,7 @@
    <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
    <Compile Include="Controllers\CellWidthController.cs" />
    <Compile Include="Controllers\CGGL\Cg_ContractBillController.cs" />
    <Compile Include="Controllers\CGGL\Cg_OrderTransportBillListController.cs" />
    <Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" />
    <Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
    <Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
WebAPI/WebAPI.csproj.user
@@ -12,7 +12,7 @@
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WMES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile15.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile6.pubxml</NameOfLastUsedPublishProfile>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ