MES-WEB-API.git

parent: 95406a6b | 补丁 | 提交 | ignore whitespace

duhe

2023-11-09 dd6a64701b6ade18e1a4742deac10f21bedb723c

特批申请单：审核后自动审核源单(已注释，待优化)

3个文件已修改

	DAL/销售管理/ClsXs_ExceptiveCheckRequestBill.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/XSGL/Xs_ExceptiveCheckRequestBillController.cs	326 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DAL/ÏúÊÛ¹ÜÀí/ClsXs_ExceptiveCheckRequestBill.cs

@@ -218,6 +218,11 @@
                omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();

                omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
                omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryID"]);
                omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
                omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
                //========================================================     
                omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
                omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);

 WebAPI/Controllers/XSGL/Xs_ExceptiveCheckRequestBillController.cs

@@ -469,8 +469,59 @@
                if (IsAudit == 0) //å®¡æ ¸æäº¤
                {
                    //å®¡æ ¸æäº¤
                    //oBill.oCn.BeginTran();
                    if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        //if (oBill.omodel.HMainSourceBillType == "1401")              //èªå¨å®¡æ ¸éå®è®¢å
                        //{
                        //    objJsonResult = AuditXs_SeOrderBill((int)oBill.omodel.HMainSourceInterID, 0, CurUserName);
                        //    if (objJsonResult.count != 0)
                        //    {
                        //        oBill.oCn.Commit();

                        //        objJsonResult.code = "1";
                        //        objJsonResult.count = 1;
                        //        objJsonResult.Message = "å®¡æ ¸æå";
                        //        objJsonResult.data = null;
                        //        return objJsonResult;
                        //    }
                        //    else
                        //    {
                        //        //oBill.oCn = new SQLHelper.ClsCN();
                        //        return objJsonResult;
                        //    }

                        //}
                        //else if (oBill.omodel.HMainSourceBillType == "1205")        //èªå¨å®¡æ ¸éå®åºåºå
                        //{
                        //    objJsonResult = AuditKf_SellOutBill((int)oBill.omodel.HMainSourceInterID, 0, CurUserName);
                        //    if (objJsonResult.count != 0)
                        //    {
                        //        oBill.oCn.Commit();

                        //        objJsonResult.code = "1";
                        //        objJsonResult.count = 1;
                        //        objJsonResult.Message = "å®¡æ ¸æå";
                        //        objJsonResult.data = null;
                        //        return objJsonResult;
                        //    }
                        //    else
                        //    {
                        //        //oBill.oCn = new SQLHelper.ClsCN();
                        //        return objJsonResult;
                        //    }
                        //}
                        //else
                        //{
                        //    //oBill.oCn = new SQLHelper.ClsCN();
                        //    objJsonResult.code = "0";
                        //    objJsonResult.count = 0;
                        //    objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :æºåç±»åéè¯¯ï¼";
                        //    objJsonResult.data = null;
                        //    return objJsonResult;
                        //}


                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "å®¡æ ¸æå";
@@ -479,6 +530,7 @@
                    }
                    else
                    {
                        //oBill.oCn = new SQLHelper.ClsCN();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
@@ -517,6 +569,280 @@
                return objJsonResult;
            }
        }

        #region å®¡æ ¸éå®è®¢å
        public json AuditXs_SeOrderBill(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Xs_SeOrderBill_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //å®¡æ ¸æé
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥ï¼æ æéï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //HInterIDæ°æ®å¤æ
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æºåHInterIDå°äº0ï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //å¯¹HInterIDè¿è¡ç±»åçè½¬æ¢
                DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill();                              //å®ä¾ååæ®æä½ç±»ï¼ç¨äºè¿è¡ç¸å³æä½

                //éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
                {
                    if (oBill.omodel.HCloseMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºååæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oBill.omodel.HDeleteMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºååæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (IsAudit == 0)  //å®¡æ ¸å¤æ
                    {
                        if (oBill.omodel.HChecker.Trim() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "æºååæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //åå®¡æ ¸å¤æ
                    {
                        if (oBill.omodel.HChecker.Trim() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "æºååæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æºååæ®ä¸åå¨!åå :" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //è¿è¡éè¦è¿è¡çå®¡æ ¸/åå®¡æ ¸æä½
                if (IsAudit == 0) //å®¡æ ¸æäº¤
                {
                    //å®¡æ ¸æäº¤
                    if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "æºåå®¡æ ¸æå";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (IsAudit == 1) //åå®¡æ ¸æäº¤
                {
                    //åå®¡æ ¸æäº¤AbandonCheck
                    if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "æºååå®¡æ ¸æå";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºååå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥æèåå®¡æ ¸å¤±è´¥ï¼" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å®¡æ ¸éå®åºåºå
        public json AuditKf_SellOutBill(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Kf_SellOutBill_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //å®¡æ ¸æé
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥ï¼æ æéï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //HInterIDæ°æ®å¤æ
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æºåHInterIDå°äº0ï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //å¯¹HInterIDè¿è¡ç±»åçè½¬æ¢
                DAL.ClsKf_SellOutBill oBill = new DAL.ClsKf_SellOutBill();                              //å®ä¾ååæ®æä½ç±»ï¼ç¨äºè¿è¡ç¸å³æä½

                //éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
                {
                    if (oBill.omodel.HCloseMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºååæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (oBill.omodel.HDeleteMan.Trim() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºååæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (IsAudit == 0)  //å®¡æ ¸å¤æ
                    {
                        if (oBill.omodel.HChecker.Trim() != "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "æºååæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    if (IsAudit == 1) //åå®¡æ ¸å¤æ
                    {
                        if (oBill.omodel.HChecker.Trim() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "æºååæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æºååæ®ä¸åå¨!åå :" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                //è¿è¡éè¦è¿è¡çå®¡æ ¸/åå®¡æ ¸æä½
                if (IsAudit == 0) //å®¡æ ¸æäº¤
                {
                    //å®¡æ ¸æäº¤
                    if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "æºåå®¡æ ¸æå";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (IsAudit == 1) //åå®¡æ ¸æäº¤
                {
                    //åå®¡æ ¸æäº¤AbandonCheck
                    if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "æºååå®¡æ ¸æå";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "æºååå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥æèåå®¡æ ¸å¤±è´¥ï¼" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #endregion

        #region ç¹æ¹ç³è¯·å å³é/åå³é

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -20,12 +20,12 @@
    <File Include="bin/BLL.dll">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>11/09/2023 16:26:51</publishTime>
      <publishTime>11/09/2023 18:44:19</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/09/2022 16:02:08</publishTime>
      <publishTime>11/02/2022 22:03:01</publishTime>
      <publishTime>11/09/2023 16:26:51</publishTime>
      <publishTime>11/09/2023 18:44:19</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
    <File Include="bin/DAL.dll">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>11/09/2023 16:26:49</publishTime>
      <publishTime>11/09/2023 18:44:17</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/09/2022 16:02:06</publishTime>
      <publishTime>11/02/2022 22:02:58</publishTime>
      <publishTime>11/09/2023 16:26:49</publishTime>
      <publishTime>11/09/2023 18:44:17</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
    <File Include="bin/DBUtility.dll">
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>11/15/2022 13:55:23</publishTime>
      <publishTime>11/09/2023 16:26:46</publishTime>
      <publishTime>11/09/2023 18:44:15</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/09/2022 16:01:58</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>11/09/2023 16:26:46</publishTime>
      <publishTime>11/09/2023 18:44:15</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -107,12 +107,12 @@
    <File Include="bin/Model.dll">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>11/09/2023 16:26:47</publishTime>
      <publishTime>11/09/2023 18:44:15</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/09/2022 16:02:01</publishTime>
      <publishTime>11/02/2022 22:02:56</publishTime>
      <publishTime>11/09/2023 16:26:47</publishTime>
      <publishTime>11/09/2023 18:44:15</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,33 +147,33 @@
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>11/09/2023 16:26:45</publishTime>
      <publishTime>11/09/2023 18:44:13</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/09/2022 16:01:56</publishTime>
      <publishTime>11/02/2022 22:02:54</publishTime>
      <publishTime>11/09/2023 16:26:45</publishTime>
      <publishTime>11/09/2023 18:44:13</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>11/09/2023 16:26:45</publishTime>
      <publishTime>11/09/2023 18:44:14</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>11/09/2023 16:26:45</publishTime>
      <publishTime>11/09/2023 18:44:14</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/09/2023 16:26:46</publishTime>
      <publishTime>11/09/2023 18:44:14</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/09/2022 16:01:57</publishTime>
      <publishTime>11/02/2022 22:02:55</publishTime>
      <publishTime>11/09/2023 16:26:46</publishTime>
      <publishTime>11/09/2023 18:44:14</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -286,7 +286,7 @@
    <File Include="bin/WebAPI.dll">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>11/09/2023 16:26:56</publishTime>
      <publishTime>11/09/2023 18:44:23</publishTime>
    </File>
    <File Include="bin/WebAPI.dll.config">
      <publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,7 +294,7 @@
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/14/2022 11:23:59</publishTime>
      <publishTime>11/02/2022 22:03:04</publishTime>
      <publishTime>11/09/2023 16:26:56</publishTime>
      <publishTime>11/09/2023 18:44:23</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -503,7 +503,7 @@
    <File Include="Web.config">
      <publishTime>11/14/2022 11:24:08</publishTime>
      <publishTime>11/02/2022 22:03:20</publishTime>
      <publishTime>11/09/2023 16:27:05</publishTime>
      <publishTime>11/09/2023 18:44:27</publishTime>
    </File>
  </ItemGroup>
</Project>

			@@ -218,6 +218,11 @@
			omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
			omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
			omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();

			omodel.HMainSourceInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceInterID"]);
			omodel.HMainSourceEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMainSourceEntryID"]);
			omodel.HMainSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillNo"]);
			omodel.HMainSourceBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMainSourceBillType"]);
			//========================================================
			omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
			omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);

			@@ -469,8 +469,59 @@
			if (IsAudit == 0) //å®¡æ ¸æäº¤
			{
			//å®¡æ ¸æäº¤
			//oBill.oCn.BeginTran();
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			//if (oBill.omodel.HMainSourceBillType == "1401") //èªå¨å®¡æ ¸éå®è®¢å
			//{
			// objJsonResult = AuditXs_SeOrderBill((int)oBill.omodel.HMainSourceInterID, 0, CurUserName);
			// if (objJsonResult.count != 0)
			// {
			// oBill.oCn.Commit();

			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "å®¡æ ¸æå";
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// //oBill.oCn = new SQLHelper.ClsCN();
			// return objJsonResult;
			// }

			//}
			//else if (oBill.omodel.HMainSourceBillType == "1205") //èªå¨å®¡æ ¸éå®åºåºå
			//{
			// objJsonResult = AuditKf_SellOutBill((int)oBill.omodel.HMainSourceInterID, 0, CurUserName);
			// if (objJsonResult.count != 0)
			// {
			// oBill.oCn.Commit();

			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "å®¡æ ¸æå";
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// //oBill.oCn = new SQLHelper.ClsCN();
			// return objJsonResult;
			// }
			//}
			//else
			//{
			// //oBill.oCn = new SQLHelper.ClsCN();
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :æºåç±»åéè¯¯ï¼";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æå";
			@@ -479,6 +530,7 @@
			}
			else
			{
			//oBill.oCn = new SQLHelper.ClsCN();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			@@ -517,6 +569,280 @@
			return objJsonResult;
			}
			}

			#region å®¡æ ¸éå®è®¢å
			public json AuditXs_SeOrderBill(int HInterID, int IsAudit, string CurUserName)
			{
			string ModRightNameCheck = "Xs_SeOrderBill_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			try
			{
			//å®¡æ ¸æé
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥ï¼æ æéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//HInterIDæ°æ®å¤æ
			if (HInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåHInterIDå°äº0ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}


			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID); //å¯¹HInterIDè¿è¡ç±»åçè½¬æ¢
			DAL.ClsXs_SeOrderBill oBill = new DAL.ClsXs_SeOrderBill(); //å®ä¾ååæ®æä½ç±»ï¼ç¨äºè¿è¡ç¸å³æä½

			//éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
			{
			if (oBill.omodel.HCloseMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HDeleteMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			{
			if (oBill.omodel.HChecker.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®ä¸åå¨!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}


			//è¿è¡éè¦è¿è¡çå®¡æ ¸/åå®¡æ ¸æä½
			if (IsAudit == 0) //å®¡æ ¸æäº¤
			{
			//å®¡æ ¸æäº¤
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æºåå®¡æ ¸æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //åå®¡æ ¸æäº¤
			{
			//åå®¡æ ¸æäº¤AbandonCheck
			if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æºååå®¡æ ¸æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥æèåå®¡æ ¸å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region å®¡æ ¸éå®åºåºå
			public json AuditKf_SellOutBill(int HInterID, int IsAudit, string CurUserName)
			{
			string ModRightNameCheck = "Kf_SellOutBill_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			try
			{
			//å®¡æ ¸æé
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥ï¼æ æéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//HInterIDæ°æ®å¤æ
			if (HInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåHInterIDå°äº0ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}


			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID); //å¯¹HInterIDè¿è¡ç±»åçè½¬æ¢
			DAL.ClsKf_SellOutBill oBill = new DAL.ClsKf_SellOutBill(); //å®ä¾ååæ®æä½ç±»ï¼ç¨äºè¿è¡ç¸å³æä½

			//éå¯¹éè¦è¿è¡çæä½ï¼æ£éªå½ååæ®çç¶ææ¯å¦æ¯æéè¦è¿è¡çæä½
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //æ ¹æ®HInterIDè·åè¯¥åæ®çæ°æ®
			{
			if (oBill.omodel.HCloseMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®å·²å³é!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HDeleteMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®å·²ä½åº!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (IsAudit == 0) //å®¡æ ¸å¤æ
			{
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //åå®¡æ ¸å¤æ
			{
			if (oBill.omodel.HChecker.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®æªå®¡æ ¸!ä¸éè¦åå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååæ®ä¸åå¨!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}


			//è¿è¡éè¦è¿è¡çå®¡æ ¸/åå®¡æ ¸æä½
			if (IsAudit == 0) //å®¡æ ¸æäº¤
			{
			//å®¡æ ¸æäº¤
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æºåå®¡æ ¸æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			if (IsAudit == 1) //åå®¡æ ¸æäº¤
			{
			//åå®¡æ ¸æäº¤AbandonCheck
			if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "æºååå®¡æ ¸æå";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºååå®¡æ ¸å¤±è´¥!åå :" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æºåå®¡æ ¸å¤±è´¥æèåå®¡æ ¸å¤±è´¥ï¼" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#endregion

			#region ç¹æ¹ç³è¯·å å³é/åå³é

			@@ -20,12 +20,12 @@
			<File Include="bin/BLL.dll">
			<publishTime>11/09/2022 16:02:08</publishTime>
			<publishTime>11/02/2022 22:03:01</publishTime>
			<publishTime>11/09/2023 16:26:51</publishTime>
			<publishTime>11/09/2023 18:44:19</publishTime>
			</File>
			<File Include="bin/BLL.pdb">
			<publishTime>11/09/2022 16:02:08</publishTime>
			<publishTime>11/02/2022 22:03:01</publishTime>
			<publishTime>11/09/2023 16:26:51</publishTime>
			<publishTime>11/09/2023 18:44:19</publishTime>
			</File>
			<File Include="bin/BouncyCastle.Crypto.dll">
			<publishTime>12/18/2020 05:32:28</publishTime>
			@@ -33,12 +33,12 @@
			<File Include="bin/DAL.dll">
			<publishTime>11/09/2022 16:02:06</publishTime>
			<publishTime>11/02/2022 22:02:58</publishTime>
			<publishTime>11/09/2023 16:26:49</publishTime>
			<publishTime>11/09/2023 18:44:17</publishTime>
			</File>
			<File Include="bin/DAL.pdb">
			<publishTime>11/09/2022 16:02:06</publishTime>
			<publishTime>11/02/2022 22:02:58</publishTime>
			<publishTime>11/09/2023 16:26:49</publishTime>
			<publishTime>11/09/2023 18:44:17</publishTime>
			</File>
			<File Include="bin/Dapper.dll">
			<publishTime>07/22/2016 22:52:40</publishTime>
			@@ -46,12 +46,12 @@
			<File Include="bin/DBUtility.dll">
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>11/15/2022 13:55:23</publishTime>
			<publishTime>11/09/2023 16:26:46</publishTime>
			<publishTime>11/09/2023 18:44:15</publishTime>
			</File>
			<File Include="bin/DBUtility.pdb">
			<publishTime>11/09/2022 16:01:58</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>11/09/2023 16:26:46</publishTime>
			<publishTime>11/09/2023 18:44:15</publishTime>
			</File>
			<File Include="bin/Grpc.Core.Api.dll">
			<publishTime>03/22/2022 13:17:26</publishTime>
			@@ -107,12 +107,12 @@
			<File Include="bin/Model.dll">
			<publishTime>11/09/2022 16:02:01</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>11/09/2023 16:26:47</publishTime>
			<publishTime>11/09/2023 18:44:15</publishTime>
			</File>
			<File Include="bin/Model.pdb">
			<publishTime>11/09/2022 16:02:01</publishTime>
			<publishTime>11/02/2022 22:02:56</publishTime>
			<publishTime>11/09/2023 16:26:47</publishTime>
			<publishTime>11/09/2023 18:44:15</publishTime>
			</File>
			<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
			<publishTime>04/06/2023 15:57:02</publishTime>
			@@ -147,33 +147,33 @@
			<File Include="bin/Pub_Class.dll">
			<publishTime>11/09/2022 16:01:56</publishTime>
			<publishTime>11/02/2022 22:02:54</publishTime>
			<publishTime>11/09/2023 16:26:45</publishTime>
			<publishTime>11/09/2023 18:44:13</publishTime>
			</File>
			<File Include="bin/Pub_Class.pdb">
			<publishTime>11/09/2022 16:01:56</publishTime>
			<publishTime>11/02/2022 22:02:54</publishTime>
			<publishTime>11/09/2023 16:26:45</publishTime>
			<publishTime>11/09/2023 18:44:13</publishTime>
			</File>
			<File Include="bin/Pub_Control.dll">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>11/09/2023 16:26:45</publishTime>
			<publishTime>11/09/2023 18:44:14</publishTime>
			</File>
			<File Include="bin/Pub_Control.pdb">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>11/09/2023 16:26:45</publishTime>
			<publishTime>11/09/2023 18:44:14</publishTime>
			</File>
			<File Include="bin/RestSharp.dll">
			<publishTime>08/31/2012 06:22:50</publishTime>
			</File>
			<File Include="bin/SQLHelper.dll">
			<publishTime>11/09/2023 16:26:46</publishTime>
			<publishTime>11/09/2023 18:44:14</publishTime>
			</File>
			<File Include="bin/SQLHelper.pdb">
			<publishTime>11/09/2022 16:01:57</publishTime>
			<publishTime>11/02/2022 22:02:55</publishTime>
			<publishTime>11/09/2023 16:26:46</publishTime>
			<publishTime>11/09/2023 18:44:14</publishTime>
			</File>
			<File Include="bin/stdole.dll">
			<publishTime>05/09/2021 13:35:37</publishTime>
			@@ -286,7 +286,7 @@
			<File Include="bin/WebAPI.dll">
			<publishTime>11/14/2022 11:23:59</publishTime>
			<publishTime>11/02/2022 22:03:04</publishTime>
			<publishTime>11/09/2023 16:26:56</publishTime>
			<publishTime>11/09/2023 18:44:23</publishTime>
			</File>
			<File Include="bin/WebAPI.dll.config">
			<publishTime>12/15/2021 17:59:43</publishTime>
			@@ -294,7 +294,7 @@
			<File Include="bin/WebAPI.pdb">
			<publishTime>11/14/2022 11:23:59</publishTime>
			<publishTime>11/02/2022 22:03:04</publishTime>
			<publishTime>11/09/2023 16:26:56</publishTime>
			<publishTime>11/09/2023 18:44:23</publishTime>
			</File>
			<File Include="bin/WebGrease.dll">
			<publishTime>07/18/2013 01:03:52</publishTime>
			@@ -503,7 +503,7 @@
			<File Include="Web.config">
			<publishTime>11/14/2022 11:24:08</publishTime>
			<publishTime>11/02/2022 22:03:20</publishTime>
			<publishTime>11/09/2023 16:27:05</publishTime>
			<publishTime>11/09/2023 18:44:27</publishTime>
			</File>
			</ItemGroup>
			</Project>