1.销售出库 2.客户 3.班组 4.用户 5.应收单

duhe

2024-04-26 d58d7c27ed6a80a78522916ff12763a0a522c81a

1.销售出库
2.客户
3.班组
4.用户
5.应收单

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

@@ -51,6 +51,10 @@
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Delete " + lngBillKey.ToString());
                }
                else if (DetailColl[0].HSourceBillType == "1402")                    //发货通知单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
                }
                else
                {

@@ -80,6 +84,10 @@
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellOut_Add " + lngBillKey.ToString());
                }
                else if(DetailColl[0].HSourceBillType == "1402")                    //发货通知单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Add " + lngBillKey.ToString());
                }
                else
                {


 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -206,14 +206,14 @@
                    ",HWhID,HWHName,HSupID,HSupName " +
                    ",HSCWHID,HSCWHName " +
                    ",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
                    ",HGroupID,HSourceID,HCheckEmpID) " +
                    ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber) " +
                    "values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "',"+ lsmain[0].HK3UserID.ToString() + "" +
                    ","+ lsmain[0].HKeeperID.ToString() + ",'"+ lsmain[0].HKeeper.ToString() + "',"+ lsmain[0].HSecManagerID.ToString() + ",'"+ lsmain[0].HSecManager.ToString() + "'" +
                    "," + lsmain[0].HSellManID.ToString() + ",'" + lsmain[0].HSellMan.ToString() + "'," + lsmain[0].HDeptID.ToString() + ",'" + lsmain[0].HDept.ToString() + "'" +
                    "," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" +
                    "," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" + 
                    ",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + "," + lsmain[0].HProcID.ToString() + "" +
                    ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + ")");
                    ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "'" + ")");

                    //新增后查询  ç¡®ä¿æ•°æ®æ·»åŠ æˆåŠŸ
                    ds = oCN.RunProcReturn("Select * from  Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
@@ -264,10 +264,12 @@
                        ",HProcID=" + lsmain[0].HProcID.ToString() +
                        ",HSourceID=" + lsmain[0].HSourceID.ToString() +
                        ",HGroupID=" + lsmain[0].HGroupID.ToString() +
                        ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
                        ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
                        ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
                        ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
                        ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
                        ",HICNumber='" + lsmain[0].HICNumber + "'" +
                        "  where  Czybm='" + lsmain[0].Czybm.ToString() + "'");
                    }
                    else
@@ -293,10 +295,12 @@
                            ",HProcID=" + lsmain[0].HProcID.ToString() +
                           ",HSourceID=" + lsmain[0].HSourceID.ToString() +
                           ",HGroupID=" + lsmain[0].HGroupID.ToString() +
                           ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
                           ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
                           ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
                           ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
                           ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
                            ",HICNumber='" + lsmain[0].HICNumber + "'" +
                           "  where  Czybm='" + lsmain[0].Czybm.ToString() + "'");
                    }


 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -148,7 +148,7 @@
            try
            {
                string sql = string.Format(@"select  c.HItemID,c.HNumber å®¢æˆ·ä»£ç ,c.HName å®¢æˆ·åç§°,c.HHelpCode  åŠ©è®°ç ,c.HShortName ç®€ç§°,c.HAddress åœ°å€,c.HLinkMan è”系人,c.HLinkPhone è”系电话
                                            ,c.HMobilePhone æ‰‹æœº,c.HFax ä¼ çœŸ,c.HPostalCode é‚®ç¼–,c.HEmail ç”µå­é‚®ä»¶,c.HCorMan æ³•äººä»£è¡¨,c.HBank å¼€æˆ·é“¶è¡Œ,c.HBankAccount é“¶è¡Œè´¦å·,
                                            ,c.HMobilePhone æ‰‹æœº,c.HFax ä¼ çœŸ,c.HPostalCode é‚®ç¼–,c.HEmail ç”µå­é‚®ä»¶,c.HCorMan æ³•äººä»£è¡¨,c.HBank å¼€æˆ·é“¶è¡Œ,c.HBankAccount é“¶è¡Œè´¦å·,c.HMateOutEmp é¢†ç”¨äºº,
                                            c.HTaxNum ç¨ŽåŠ¡ç™»è®°å·,c.HTaxRate å¢žå€¼ç¨ŽçŽ‡,c.HEnglishName è‹±æ–‡åç§°,c.HEngLishAddress è‹±æ–‡åœ°å€,c.HCountry å›½å®¶,c.HCusStatus å®¢æˆ·çŠ¶æ€
                                            ,c.HStopflag ç¦ç”¨æ ‡å¿—,c.HRemark å¤‡æ³¨,c.HAreaID åœ°åŒºID,a.HName åœ°åŒºåç§°,c.HCurID é»˜è®¤è´§å¸ID,r.HName é»˜è®¤è´§å¸,
                                            c.HSSID ç»“算方式ID,s.HName ç»“算方式,c.HCusTypeID å®¢æˆ·åˆ†ç±»ID,t.HName å®¢æˆ·åˆ†ç±» from Gy_Customer c
@@ -354,7 +354,7 @@
                DateTime HMakeTime = list[0].HMakeTime;
                long HCreateOrgID = list[0].HCREATEORGID;
                long HUseOrgID = list[0].HUSEORGID;

                string HMateOutEmp = list[0].HMateOutEmp;
                //DateTime HDeleteDate = list[0].HDeleteDate;


@@ -382,7 +382,7 @@
                    ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
                    ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
                    ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
                    ",HCusTypeID,HCREATEORGID,HUSEORGID) " +
                    ",HCusTypeID,HCREATEORGID,HUSEORGID,HMateOutEmp) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
                    ", " + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
                    ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
@@ -392,7 +392,7 @@
                    "," + HEmpID + "," + HCreditDate + "," + HCreditRatingDate + "," + HMaxCredRatingDate +
                    "," + HMonthUseQty + "," + HForecastCreditRating + "," + HCreditLevelID + "," + HCountAccrualRating +
                    "," + HSubsidyAccrualRating + "," + HCreditRating + "," + HMaxCreditRating +
                    ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ")");
                    ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ",'"+ HMateOutEmp + "')");
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Customer set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

@@ -608,7 +608,7 @@
                DateTime HMakeTime = list[0].HMakeTime;
                long HCreateOrgID = list[0].HCREATEORGID;
                long HUseOrgID = list[0].HUSEORGID;

                string HMateOutEmp = list[0].HMateOutEmp;

                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
@@ -665,7 +665,8 @@
                    ",HAreaID  ='" + HAreaID + "'" +
                    ",HCusStatus  ='" + HCusStatus + "'" +
                    ",HCusTypeID  ='" + HCusTypeID + "'" +
                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    ",HMateOutEmp='"+ HMateOutEmp+
                    "',HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§

 WebAPI/Controllers/BaseSet/Gy_GroupController.cs

@@ -298,6 +298,7 @@
                var HDeptID = list[0].HDeptID;
                long HProcID = list[0].HProcID;
                int HUSEORGID = list[0].HUSEORGID;
                string HCompName = list[0].HCompName;
                var HDeptNumber = "";
                //var HEndFlag = 0;
                long HLevel = 1;
@@ -338,10 +339,10 @@
                    oCN.RunProc("Insert into Gy_Group " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HEmpQty,HDeptID,HDeptNumber,HProcID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID) " +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID,HCompName) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    "," + HEmpQty.ToString() + "," + HDeptID.ToString() + ",'" + HDeptNumber + "'," + HProcID.ToString() +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ",'" + HCompName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -360,7 +361,8 @@
                                 ",HRemark= '" + HRemark + "'" +
                                 ",HDeptID=" + HDeptID +
                                 ",HEmpQty=" + HEmpQty +
                                 ",HBarCodeForBase='" + HBarCodeForBase + "' " +
                                 ",HCompName='"+ HCompName+
                                 "',HBarCodeForBase='" + HBarCodeForBase + "' " +
                                 ", HProcID = '" + HProcID + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();

 WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs

@@ -1078,6 +1078,43 @@
        }
        #endregion

        #region é”€å”®å‡ºåº“单 æ ¹æ®ä¸»å†…码与子内码获取发货通知单数据
        [Route("Kf_SellOutBill/loadXs_SeOutStockBill_Push")]
        [HttpGet]
        public object loadXs_SeOrderBill_Push(long HInterID, long HSubID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_SeOutStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到源单信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region é”€å”®å‡ºåº“单 æ£€æŸ¥å•æ®æ˜¯å¦å­˜åœ¨
        /// <summary>
        /// </summary>

 WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs

@@ -363,6 +363,24 @@

                oCN.BeginTran();

                //ds = oCN.RunProcReturn("select * from h_v_Xs_ReceivableBillList_Query where hmainid=" + HInterID, "h_v_Xs_ReceivableBillList_Query");
                //foreach (DataRow row in ds.Tables[0].Rows)
                //{
                //    // èŽ·å–当前行的 HSourceBillType å€¼  
                //    string hSourceBillType = row["HSourceBillType"].ToString();

                //    if (hSourceBillType == "1401")
                //    {
                //        //应收单 åˆ é™¤å›žå¡« é”€å”®è®¢å• å…³è”数量
                //        oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToPOStockIn_Del " + HInterID);
                //    }
                //    else if (hSourceBillType == "1205")
                //    {
                //        //应收单 åˆ é™¤å›žå¡« é”€å”®å‡ºåº“单 å…³è”数量
                //        oCN.RunProc("exec h_p_Xs_UpDateRelation_ICStockoPOStockIn_Del     " + HInterID);
                //    }
                //}
                  
                oCN.RunProc("delete from Xs_ReceivableBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from Xs_ReceivableBillSub where HInterID= " + HInterID);


 WebAPI/Models/Customer.cs

@@ -96,7 +96,7 @@

        public long HUSEORGID { get; set; }


        public string HMateOutEmp { get; set; }//领用人


    }

 WebAPI/Models/Gy_Group.cs

@@ -23,6 +23,9 @@
        public int HUSEORGID;

        public string HBarCodeForBase { get; set; }
        

        public string HCompName { get; set; }//劳务单位


    }
}

 WebAPI/Models/Gy_User.cs

@@ -35,5 +35,8 @@
        public int HGroupID;
        public int HSourceID;
        public int HCheckEmpID;
        public int HWorkCenterID;

        public string HICNumber;
    }
}