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

dytyqx

5 天以前 85384dd5eaa81be10caeaea5fc827c9e6f7495f7

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

 DAL/ClsWL_YayBillMain.cs

@@ -92,11 +92,8 @@
                ",HMainSourceInterID='" + omodel.HMainSourceInterID.ToString() + "'" +
                ",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +

                ",HCusID='" + omodel.HCusID.ToString() + "'" +
                ",HBeginAddr='" + omodel.HBeginAddr.ToString() + "'" +
                ",HEndAddr='" + omodel.HEndAddr.ToString() + "'" +
                ",HPickAddr='" + omodel.HPickAddr.ToString() + "'" +
                ",HArriverAddr='" + omodel.HArriverAddr.ToString() + "'" +
                ",HTransType='" + omodel.HTransType.ToString() + "'" +
                ",HCarTypeID='" + omodel.HCarTypeID.ToString() + "'" +
                ",HCarTypeMaxVolume='" + omodel.HCarTypeMaxVolume.ToString() + "'" +
@@ -145,7 +142,7 @@
               "(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
               ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
               ",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
               ",HMouldFoldHeight,HVolume,HQty,HSNP,HScatteredVolume,HMouldQty) values("
               ",HMouldFoldHeight,HVolume,HQty,HSNP,HScatteredVolume,HMouldQtym,,HCusID,HPickAddr,HArriverAddr) values("
               + SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
               + SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
               + (oSub.HEntryID) + ",'" // HEntryID int
@@ -170,7 +167,10 @@
               + (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
               + (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
               + (oSub.HScatteredVolume) + "," // HSNP dec(18,8)
               + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
               + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ","
               + (oSub.HCusID) + "," // HSNP dec(18,8)
               + "'" + SafeString(oSub.HPickAddr?.ToString(), "") + "',"
               + "'" + SafeString(oSub.HArriverAddr?.ToString(), "") + "')"; // HMouldQty dec(18,8)
                    oCn.RunProc(sql);
                }

@@ -236,7 +236,7 @@
                string sql = "Insert Into WL_YayBillMain " +
                           "(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus," +
                           "HRemark,HMaker,HMakeDate,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
                           "HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr,HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
                           "HOrgID,HBeginAddr,HEndAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
                           "HLoadingRate,HContractTransportInterID,HContractTransportEntryID," +
                           "HContractTransportBillNo,HCarrierID,HDistance,HTransportTimes," +
                           "HTransportTyep,HSSID,HCurID,HMoney,HDateForRequestedPick," +
@@ -258,11 +258,8 @@
                           ",'" + omodel.HMainSourceEntryID + "'" +
                           ",'" + omodel.HMainSourceBillNo + "'" +
                           ",'" + omodel.HOrgID + "'" +
                           ",'" + omodel.HCusID + "'" +
                           ",'" + omodel.HBeginAddr + "'" +
                           ",'" + omodel.HEndAddr + "'" +
                           ",'" + omodel.HPickAddr + "'" +
                           ",'" + omodel.HArriverAddr + "'" +
                           ",'" + omodel.HTransType + "'" +
                           ",'" + omodel.HCarTypeID + "'" +
                           ",'" + omodel.HCarTypeMaxVolume + "'" +
@@ -292,7 +289,7 @@
              "(HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
              ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
              ",HMaterID,HUnitID,HMouldID,HMouldLength,HMouldHeight,HMouldWidth" +
              ",HMouldFoldHeight,HVolume,HQty,HSNP,HScatteredVolume,HMouldQty) values("
              ",HMouldFoldHeight,HVolume,HQty,HSNP,HScatteredVolume,HMouldQty,HCusID,HPickAddr,HArriverAddr) values("
              + SafeInt(omodel.HInterID.ToString(), 0) + ",'" // HInterID int
              + SafeString(omodel.HBillNo.ToString()) + "'," // HBillNo_bak varchar(50)
              + (oSub.HEntryID) + ",'" // HEntryID int
@@ -317,7 +314,10 @@
              + (oSub.HQty.ToString() == "" ? 0 : oSub.HQty) + "," // HQty dec(18,8)
              + (oSub.HSNP.ToString() == "" ? 0 : oSub.HSNP) + "," // HSNP dec(18,8)
              + (oSub.HScatteredVolume) + "," // HSNP dec(18,8)
              + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ")"; // HMouldQty dec(18,8)
              + (oSub.HMouldQty.ToString() == "" ? 0 : oSub.HMouldQty) + ","
              + (oSub.HCusID) + "," // HSNP dec(18,8)
              + "'" + SafeString(oSub.HPickAddr?.ToString(), "") + "',"
              + "'" + SafeString(oSub.HArriverAddr?.ToString(), "") + "')"; // HMouldQty dec(18,8)
                    oCn.RunProc(sql);
                }
                    //=========================保存后控制  

 Model/ÎïÁ÷¹ÜÀí/ClsWL_YayBillMainBillSub.cs

@@ -30,6 +30,13 @@
        public decimal HRelationQty { get; set; }              // å…³è”数量
        public decimal HRelationMoney { get; set; }            // å…³è”金额

        public int HCusID { get; set; }                // å®¢æˆ·ID


        public string HPickAddr { get; set; }                // æè´§åœ°å€

        public string HArriverAddr { get; set; }                // åˆ°è´§åœ°å€

        // è‡ªå¢žåˆ—
        public int HItemSubID { get; set; }                    // è‡ªå¢žåˆ—


 WebAPI/Controllers/ÎïÁ÷¹ÜÀí/³öÔ˵¥/WLYayBillController.cs

@@ -428,11 +428,11 @@
                return objJsonResult;
            }

            DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain a inner join WL_YayBillSub_Material b on b.HInterID=a.HInterID where a.HInterID=" + HInterID + " and b.HEntryID = " + HEntryID, "WL_YayBillMain");
            DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" +HInterID  , "WL_YayBillMain");
            if (ds != null || ds.Tables[0].Rows.Count > 0)
            {
                oCN.BeginTran();
                oCN.RunProc("update WL_YayBillSub_Material set HScatteredVolume= " + ScatteredVolume + " where HInterID=" + HInterID + "and HEntryID=" + HEntryID);
                oCN.RunProc("update WL_YayBillMain set HScatteredVolume= " + ScatteredVolume + " where HInterID=" + HInterID );
                oCN.Commit();

                objJsonResult.code = "1";
@@ -556,8 +556,12 @@

                if (IsAudit == 1)
                {

                    ds = oCN.RunProcReturn("select * from gy_car where  HItemID=" + HcheckID + "", "gy_car");
                    var HNumber = ds.Tables[0].Rows[0]["HNumber"].ToString(); 
                    var HName = ds.Tables[0].Rows[0]["HName"].ToString();
                    oCN.BeginTran();
                    oCN.RunProc("update WL_YayBillMain set HCarID='" + HcheckID + "' where HInterID=" + HInterID);
                    oCN.RunProc("update WL_YayBillMain set HCarID='" + HcheckID + "', CarHNumber='" + HNumber + "', CarHName='" + HName + "' where HInterID=" + HInterID);
                    oCN.Commit();

                    objJsonResult.code = "1";
@@ -569,8 +573,11 @@
                else
                {

                    ds = oCN.RunProcReturn("select * from Gy_Driver where  HItemID=" + HcheckID + "", "Gy_Driver");
                    var HName = ds.Tables[0].Rows[0]["HName"].ToString();
                    var HIDCard = ds.Tables[0].Rows[0]["HIDCard"].ToString();
                    oCN.BeginTran();
                    oCN.RunProc("update WL_YayBillMain set HDriverID='" + HcheckID + "',HDate_AllocationDriver=getdate()  where HInterID=" + HInterID);
                    oCN.RunProc("update WL_YayBillMain set HDriverID='" + HcheckID + "', DriverHName='" + HName + "', DriverHIDCard='" + HIDCard + "' where HInterID=" + HInterID);
                    oCN.Commit();

                    objJsonResult.code = "1";
@@ -579,6 +586,74 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region å‡ºè¿å• ç»´æŠ¤å¸æœº(平台)
        [Route("WLYayBillController/selectDriver1")]
        [HttpGet]
        public object selectDriver1(string CarHNumber, string CarHName,string DriverHName,string DriverHIDCard, string CurUserName, int HInterID)
        {
            try
            {
                //if (!DBUtility.ClsPub.Security_Log("WLYayBill_SelectDriver1", 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                DataSet ds = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取单据信息失败，单据不存在，无法进行分配车辆、司机操作！！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HChecker"]) == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据未审核，无法进行分配车辆、司机操作！！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HDate_CarrierSure"] == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据未进行供应商确认。请先进行供应商确认，然后再进行分配车辆、司机操作！！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                    oCN.BeginTran();
                    oCN.RunProc("update WL_YayBillMain set CarHNumber='" + CarHNumber + "', CarHName='" + CarHName + "', DriverHName='" + DriverHName + "', DriverHIDCard='" + DriverHIDCard + "',HDate_AllocationDriver=getdate() where HInterID=" + HInterID);
                    oCN.Commit();
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = null;
                    return objJsonResult;
                
              
            }
            catch (Exception e)
            {
@@ -637,7 +712,7 @@
                        return objJsonResult;
                    }

                    if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDriverID"].ToString() == "0" || ds.Tables[0].Rows[0]["HCarID"].ToString() == "0")
                    if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["CarHName"].ToString() == "0" || ds.Tables[0].Rows[0]["DriverHName"].ToString() == "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;