Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-04-17 fc1320034c11b77e16a960f2961d8249e4de6b9a

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/²Ö¿â¹ÜÀí/ClsKf_MoveStockBill.cs

@@ -81,6 +81,8 @@
                ",HLinkPhone='" + omodel.HLinkPhone + "'" +
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
                ",HInvoiceBillNo='" + omodel.HInvoiceBillNo + "'" +
                ",HProjectID='" + omodel.HProjectID + "'" +
                ",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
@@ -192,14 +194,14 @@
                ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
                ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
                ",HAddress,HLinkMan,HLinkPhone" +
                ",HConveyCompID,HConveyTypeID,HConveyMoney" +
                ",HConveyCompID,HConveyTypeID,HConveyMoney,HInvoiceBillNo,HProjectID" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
                ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
                ",'" + omodel.HAddress + "','" + omodel.HLinkMan + "','" + omodel.HLinkPhone + "'" +
                "," + omodel.HConveyCompID.ToString() + "," + omodel.HConveyTypeID.ToString() + "," + omodel.HConveyMoney.ToString() +
                "," + omodel.HConveyCompID.ToString() + "," + omodel.HConveyTypeID.ToString() + "," + omodel.HConveyMoney.ToString() + ",'" + omodel.HInvoiceBillNo + "'," + omodel.HProjectID.ToString() +
                ") ");
                //插入子表
                foreach (Model.ClsKf_MoveStockBillSub oSub in DetailColl)

 DAL/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/ClsGy_Supplier_Ctl.cs

@@ -24,13 +24,13 @@
                    ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                    ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                    ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HShortName + "','" + oModel.HAddress + "','" + oModel.HLinkMan + "','" + oModel.HLinkPhone + "','" + oModel.HMobilePhone + "'" +
                    ",'" + oModel.HFax + "','" + oModel.HPostalCode + "','" + oModel.HEmail + "','" + oModel.HBank + "','" + oModel.HBankAccount + "'" +
                    ",'" + oModel.HTaxNum + "'," + oModel.HTaxRate.ToString() + ",'" + oModel.HCountry + "','" + oModel.HCorMan + "','" + oModel.HEnglishName + "'" +
                    ",'" + oModel.HEnglishAddress + "'," + oModel.HCurID.ToString() + "," + oModel.HSSID.ToString() + "," + oModel.HAreaID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + oModel.HEnglishAddress + "'," + oModel.HCurID.ToString() + "," + oModel.HSSID.ToString() + "," + oModel.HAreaID.ToString() + ",'" + oModel.HMaterClass+ "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -77,7 +77,8 @@
                    ",HEnglishAddress='" + oModel.HEnglishAddress + "'" +
                    ",HCurID=" + oModel.HCurID.ToString() +
                    ",HSSID=" + oModel.HSSID.ToString() +
                    ",HAreaID=" + oModel.HAreaID.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    ",HMaterClass='"+oModel.HMaterClass+
                    "',HAreaID=" + oModel.HAreaID.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§

 DAL/Ó¦¸¶¹ÜÀí/ClsYF_PayMentBill.cs

@@ -68,7 +68,9 @@
                ",HCheckMoneyFor=" + omodel.HCheckMoneyFor.ToString() +
                ",HRemainMoney=" + omodel.HRemainMoney.ToString() +
                ",HCheckStatus=" + omodel.HCheckStatus.ToString() +

                ",HInvoiceBillNo='" + omodel.HInvoiceBillNo + "'" +
                ",HBigMoney='" + omodel.HBigMoney + "'" +
                 ",HReason='" + omodel.HReason + "'" +

                ",HSSNum='" + omodel.HSSNum + "'" +
                ",HRelSumMoney=" + omodel.HRelSumMoney.ToString() +
@@ -142,15 +144,15 @@
                ",HAccDate,HSupID,HAccSupID,HSSID,HCurID,HExRate" +
                ",HDeptID,HEmpID,HOrgID,HSumMoney,HBankID,HBankNo,HExplanation" +
                ",HSSNum,HDiscountRate,HRelSumMoney,HSumMoneyBB,HRelSumMoneyBB" +
                ",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus" +
                ",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus,HInvoiceBillNo,HBigMoney,HReason" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                ",'" + omodel.HAccDate + "'," + omodel.HSupID.ToString() + "," + omodel.HAccSupID.ToString() + "," + omodel.HSSID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
                ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HOrgID + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation +"'"+
                ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() + 
                ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() + 
                ") ");
                ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() + ",'" + omodel.HInvoiceBillNo + "','" + omodel.HBigMoney + "','" + omodel.HReason +
                "') ");
                //插入子表
                foreach (Model.ClsYF_PayMentBillSub oSub in DetailColl)
                {

 Model/²Ö¿â¹ÜÀí/ClsKf_MoveStockBillMain.cs

@@ -30,5 +30,8 @@
        public Int64 HGroupID;
        public int HStockInOrgID;       //     int             //调入组织ID
        public int HStockOutOrgID;      //     int             //调出组织ID

        public string HInvoiceBillNo;        //   å‘票编号
        public Int64 HProjectID;        //-项目
    }
}

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_Supplier_Model.cs

@@ -27,5 +27,6 @@
        public Int64 HSSID;//               int      '结算方式(Gy_SettleStyle)  
        public Int64 HAreaID;//        int      '地区(Gy_AreaSet)
        public string HBarCode;
        public string HMaterClass;  //varchar(20)  ä¾›è´§ææ–™ç±»åˆ«
    }
}

 Model/Ó¦¸¶¹ÜÀí/ClsYF_PayMentBillMain.cs

@@ -30,5 +30,8 @@
        public Single HRelSumMoney;//    dec(18,8)        //折扣后金额（可编辑）        --addnew
        public Single HSumMoneyBB;//  dec(18,8)             //表头金额本位币（可编辑）    --addnew
        public Single HRelSumMoneyBB;//    dec(18,8)        //折扣后金额本位币（可编辑）    --
        public string HInvoiceBillNo;//    varchar(100)      --发票编号
        public string HBigMoney;//    varchar(100) --大写金额
        public string HReason;//    varchar(400) --付款事由
    }
}

 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs

@@ -125,7 +125,7 @@
                                            ,s.HMobilePhone æ‰‹æœº,s.HFax ä¼ çœŸ,s.HPostalCode é‚®ç¼–,s.HEmail ç”µå­é‚®ä»¶,s.HCorMan æ³•äººä»£è¡¨,s.HBank å¼€æˆ·é“¶è¡Œ,s.HBankAccount é“¶è¡Œè´¦å·,
                                           s.HTaxNum ç¨ŽåŠ¡ç™»è®°å·,s.HEnglishName è‹±æ–‡åç§°,s.HEngLishAddress è‹±æ–‡åœ°å€,s.HCountry å›½å®¶,s.HStopflag ç¦ç”¨æ ‡å¿—
                                           ,s.HRemark å¤‡æ³¨,s.HAreaID åœ°åŒºID,a.HName åœ°åŒºåç§°,s.HTaxRate å¢žå€¼ç¨ŽçŽ‡,s.HCurID é»˜è®¤è´§å¸ID,r.HName é»˜è®¤è´§å¸,
                                           s.HSSID ç»“算方式ID,e.HName ç»“算方式 from Gy_Supplier s
                                           s.HSSID ç»“算方式ID,e.HName ç»“算方式,s.HMaterClass ä¾›è´§ææ–™ç±»åˆ«  from Gy_Supplier s
                                           left join Gy_AreaSet a on s.HAreaID=a.HItemID
                                           left join Gy_Currency r on s.HCurID=r.HItemID 
                                           left  join Gy_SettleStyle e on s.HSSID=e.HItemID
@@ -206,7 +206,7 @@
                long HCreateOrgID = list[0].HCreateOrgID;
                long HUseOrgID = list[0].HUseOrgID;
                string HRemark = list[0].HRemark;

                string HMaterClass = list[0].HMaterClass;

                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
@@ -228,14 +228,14 @@
                    ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                    ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                    ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass) " +
                " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
                "," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
                ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
                ",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
                ",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
                ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID + 
              ") ");
                ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + 
              "') ");
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCN.Commit();
@@ -280,13 +280,13 @@
                     ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                     ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                     ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                     ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
                     ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass) " +
                 " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HParentID + "'" +
                 "," + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopflag + "','" + lsmain[0].HRemark + "'" +
                 ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
                 ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
                 ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +
                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +","+lsmain[0].HMaterClass+
                  ") ");
                //修改上级为非末级代码
                sql = "set identity_insert Gy_Supplier off";
@@ -369,7 +369,7 @@
                long HCreateOrgID = list[0].HCreateOrgID;
                long HUseOrgID = list[0].HUseOrgID;
                string HRemark = list[0].HRemark;

                string HMaterClass = list[0].HMaterClass;

                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
@@ -421,7 +421,8 @@
                   ",HEnglishAddress='" + HEnglishAddress + "'" +
                   ",HCurID=" + HCurID.ToString() +
                   ",HSSID=" + HSSID.ToString() +
                   ",HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                   ",HMaterClass='" + HMaterClass +
                   "',HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);


                //修改子项目代码

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -1065,7 +1065,7 @@
        }
        #endregion

        #region å…¶ä»–入库单 ç¼–辑页面初始化
        #region ç›´æŽ¥è°ƒæ‹¨å• ç¼–辑页面初始化
        [Route("Kf_MoveStockBill/Kf_MoveStockBillEdit")]
        [HttpGet]
        public object Kf_MoveStockBillEdit(long HInterID)
@@ -1105,7 +1105,7 @@
        }
        #endregion

        #region å…¶å®ƒå…¥åº“单审核/反审核功能
        #region ç›´æŽ¥è°ƒæ‹¨å• å®¡æ ¸/反审核功能
        [Route("Kf_MoveStockBill/CheckKf_MoveStockBill")]
        [HttpGet]
        public object CheckKf_MoveStockBill(string HInterID, int Type, string user)
@@ -1303,7 +1303,7 @@
        }
        #endregion

        #region å…¶å®ƒå…¥åº“单关闭/反关闭功能
        #region ç›´æŽ¥è°ƒæ‹¨å• å…³é—­/反关闭功能
        [Route("Kf_MoveStockBill/CloseKf_MoveStockBill")]
        [HttpGet]
        public object CloseKf_MoveStockBill(string HInterID, int Type, string user)
@@ -1409,7 +1409,7 @@
        }
        #endregion

        #region å…¶ä»–入库单 ä½œåºŸ/反作废功能
        #region ç›´æŽ¥è°ƒæ‹¨å• ä½œåºŸ/反作废功能
        [Route("Kf_MoveStockBill/DropKf_MoveStockBill")]
        [HttpGet]
        public object DropKf_MoveStockBill(string HInterID, int Type, string user)

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_DutyBillController.cs

@@ -226,9 +226,9 @@
                    //保存完毕后处理
                    oCN.RunProc("Insert into Gy_Duty " +
                       " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HUserGroupID" +
                       ",HLevel,HEndFlag,HStopflag,HRemark) " +
                       ",HLevel,HEndFlag,HStopflag,HRemark,HUserCode) " +
                       " Values('" + Duty.HNumber + "','" + Duty.HName + "','" + Duty.HHelpCode + "','" + Duty.HShortNumber + "'," + Duty.HParentID.ToString() + "," + Duty.HUserGroupID.ToString() +
                       "," + Duty.HLevel.ToString() + "," + Duty.HEndFlag + "," + Convert.ToString(Duty.HStopflag ? 1 : 0) + ",'" + Duty.HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                       "," + Duty.HLevel.ToString() + "," + Duty.HEndFlag + "," + Convert.ToString(Duty.HStopflag ? 1 : 0) + ",'" + Duty.HRemark + "','" + Duty.HUserCode + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
@@ -242,6 +242,7 @@
                        ",HUserGroupID=" + Duty.HUserGroupID.ToString() +
                        ",HEndflag=" + Duty.HEndFlag +
                        ",HStopflag=" + Convert.ToString(Duty.HStopflag ? 1 : 0) +
                        ",HUserCode="+Duty.HUserCode+
                        ",HRemark= '" + Duty.HRemark + "' Where HItemID=" + Duty.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                }


 WebAPI/Models/Supplier.cs

@@ -73,6 +73,7 @@

        public long HUseOrgID { get; set; }

        public string HMaterClass { get; set; }

    }
}

 WebAPI/Models/»ù´¡×ÊÁÏ/Gy_Duty.cs

@@ -18,5 +18,6 @@
        public string HHelpCode { get; set; }
        public bool HStopflag;
        public int HEndFlag;
        public string HUserCode;
    }
}