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

zzr99

2021-11-05 e0f1e38e04ca7debc900e0e91d87b6b5b67c6a76

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

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBillMain.cs

@@ -12,7 +12,7 @@
        public string HPlanNo;
        public string HExplanation;
        public string HInnerBillNo;
        
        public Int64 HDeptID;
        
    }
}

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBillMain.cs

@@ -12,6 +12,7 @@
        public string HPlanNo;
        public string HExplanation;
        public string HInnerBillNo;
        public Int64 HDeptID;
        
        
    }

 WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs

@@ -154,7 +154,7 @@
                    return objJsonResult;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList  where HBarCode = '" + HBarCode + "'", "h_v_Gy_EquipFileMainList");
                ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList  where æ¡å½¢ç  = '" + HBarCode + "'", "h_v_Gy_EquipFileMainList");
                //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
                //写入信息
                if (ds == null)

 WebAPI/Controllers/POStockInBillController.cs

@@ -26,14 +26,14 @@
        public Int64 HWhID;//仓库ID
        public Int64 HSPID;//仓位ID

        public string HSupName=string.Empty;
        public string HDeptName=string.Empty;
        public string HWhName=string.Empty;
        public string HSPName=string.Empty;
        public string HSupName = string.Empty;
        public string HDeptName = string.Empty;
        public string HWhName = string.Empty;
        public string HSPName = string.Empty;

        public Int64 HInterID;//本单ID
        public string HBillNo;
        public string HSourceBillNo=string.Empty;
        public string HSourceBillNo = string.Empty;
        public string HBillType = "1201";//单据类型
        public string sBillCode = "ICStockBill";
        public string sTranType = "1";
@@ -43,16 +43,17 @@
        public string sSourceTypeName = "采购订单";
        public string sRedBlue2 = "蓝字";
        //public bool sRedBlue = false;
        public WebServer webserver =new WebServer();
        public DataSet ds =new DataSet();
        public ClsGy_BarCodeBill_WMS_Model_View oView =new ClsGy_BarCodeBill_WMS_Model_View();
        public ClsKF_PonderationBillMain_Temp model =new ClsKF_PonderationBillMain_Temp();
        public WebServer webserver = new WebServer();
        public DataSet ds = new DataSet();
        public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
        public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
        public ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
        public double sRelQty = 0;
       // private DataBaseServices objDataBaseServices = new DataBaseServices();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        // private DataBaseServices objDataBaseServices = new DataBaseServices();

        private JsonResult objJsonResult = new JsonResult();
       // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}";
        // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}";

        public static string GetSession(string sMsg)
        {
@@ -113,7 +114,7 @@
            {
                HBillType = "1239";
            }
            oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID,sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            if (oBar == null)
            {
                objJsonResult.code = "0";
@@ -168,16 +169,16 @@
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！" + HSourceBillType;
                    objJsonResult.data = null;
                    return objJsonResult; 
                    return objJsonResult;
                }
                else
                { 
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    

                }
            }
            catch (Exception ex)
@@ -199,12 +200,12 @@
        /// <returns></returns>
        [Route("POStockInBill/set_SavePonderationBillMain_Temp_Source_Fast_Json")]
        [HttpGet]
        public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType,string HSourceBillNo, Int64 sInterID, string sBillNo)
        public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
        {
            try
            {
               // DataSet ds = new DataSet();
               // WebServer webserver = new WebServer();
                // DataSet ds = new DataSet();
                // WebServer webserver = new WebServer();
                string sWhere = " Where å•æ®å· like '%" + HSourceBillNo.Trim() + "'";
                //根据源单类型来调用不同的WEBS方法 new 
                if (HSourceBillType == "1102")
@@ -259,10 +260,10 @@
            }
            catch (Exception ex)
            {
                

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！"+ex.ToString();
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -299,12 +300,12 @@
            }
            catch (Exception e)
            {
                
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！"+e.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
@@ -327,7 +328,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message ="";
                objJsonResult.Message = "";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -335,7 +336,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败！"+DBUtility.ClsPub.sErrInfo;
                objJsonResult.Message = "失败！" + DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -363,7 +364,7 @@
            else
            {

                if (webserver.set_SavePonderationBillMain_Temp_Source_SourceBillType(sInterID, sBillNo, HBillType, sBarCode, sRedBlue2, ref HSourceBillNo, ref sSourceTypeName, ref HSupID, ref  HSupName, ref HDeptID, ref HDeptName, ref DBUtility.ClsPub.sErrInfo))
                if (webserver.set_SavePonderationBillMain_Temp_Source_SourceBillType(sInterID, sBillNo, HBillType, sBarCode, sRedBlue2, ref HSourceBillNo, ref sSourceTypeName, ref HSupID, ref HSupName, ref HDeptID, ref HDeptName, ref DBUtility.ClsPub.sErrInfo))
                {
                    //----------创建虚表------------------------
                    DataTable dt_Main = new DataTable("Json");
@@ -424,7 +425,7 @@
        [HttpGet]
        public object get_InfoByBarCode_Source_Json(string sBarCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID)
        {
           // string sRedBlue = "蓝字";
            // string sRedBlue = "蓝字";
            try
            {
                string sErrMsg = "";
@@ -473,12 +474,12 @@
            }
            catch (Exception e)
            {
                
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "扫码失败,此条码不存在！"+e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫码失败,此条码不存在！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
@@ -487,7 +488,7 @@
        /// <returns></returns>
        [Route("POStockInBill/set_SavePOStockInBackBill_Json")]
        [HttpPost]
        public object set_SavePOStockInBackBill_Json([FromBody]JObject oMain)
        public object set_SavePOStockInBackBill_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
@@ -543,7 +544,7 @@
        /// <returns></returns>
        [Route("POStockInBill/set_SavePOStockInBill_Json")]
        [HttpPost]
        public object set_SavePOStockInBill_Json([FromBody]JObject oMain)
        public object set_SavePOStockInBill_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
@@ -607,7 +608,7 @@

        [Route("POStockInBill/GetSpName_Json")]
        [HttpGet]
        public object GetSpName_Json(long HSpID, long HWHID,long HStockOrgID, ref string sErrMsg)
        public object GetSpName_Json(long HSpID, long HWHID, long HStockOrgID, ref string sErrMsg)
        {
            try
            {
@@ -650,7 +651,7 @@
            string sErrMsg = string.Empty;
            try
            {
                if (webserver.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID,HAuxPropID,HMTONo,HSourceInterID,HSourceEntryID,sHBillType,ref sErrMsg))
                if (webserver.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
@@ -719,7 +720,7 @@

        [Route("POStockInBillList/DisBillEntryList_Mate_Webs_Json")]
        [HttpGet]
        public object DisBillEntryList_Webs_Json(string HBillType,string sWhere)
        public object DisBillEntryList_Webs_Json(string HBillType, string sWhere)
        {
            try
            {
@@ -789,5 +790,125 @@

        }


        #region åˆ°è´§ç‚¹æ•°
        [Route("POStockInBillList/get_InfoByBillNo")]
        [HttpGet]
        public object get_InfoByBillNo(string HBillno)
        {
            try
            {
                string sqlwhere = " where 1=1 ";
                if (!String.IsNullOrEmpty(HBillno))
                    sqlwhere += "and å•æ®å·='" + HBillno + "'";
                string sql = $"select * from h_v_Cg_POInStockBillList {sqlwhere} ";
                ds = oCn.RunProcReturn(sql, "h_v_Cg_POInStockBillList");
                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 = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败 ï¼";
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        //[Route("POStockInBillList/confirm")]
        //public object confirm(string hmainid)
        //{
        //    try
        //    {
        //        JObject model = new JObject();
        //        model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //单据类型
        //        model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //通知日期
        //        model.Add("FStockOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); // æ”¶æ–™ç»„织 
        //        model.Add("FPurOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); //采购组织
        //        model.Add("FSupplierId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FSupplierID") as DynamicObject)?["Number"].ToString() ?? "" }); //供应商
        //        model.Add("FOwnerTypeIdHead", "BD_OwnerOrg");//  è´§ä¸»ç±»åž‹
        //        model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" });//货主 
        //                                                                                                                                                     //子表 æ•°æ®æ¨¡åž‹
        //        JArray Fentity = new JArray();
        //        foreach (var item in entityRows)
        //        {
        //            if (Convert.ToBoolean(item["FCloseStatus"]))
        //                continue;
        //            JObject FentityModel = new JObject();
        //            FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = (item["FHMaterID"] as DynamicObject)?["Number"].ToString() ?? "" }); // ç‰©æ–™ç¼–码   
        //            FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); // å•ä½   
        //            FentityModel.Add("FPreDeliveryDate", this.Model.GetValue("FHDate").ToString()); //预计到货日期   
        //            FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); // è®¡ä»·å•ä½   
        //            FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); //  åº“存单位   
        //            FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["FHQty"]) - Convert.ToDecimal(item["FReciveCount"])); // ä¾›åº”商送货数量（提料计划数量 - å·²ç”Ÿæˆé€è´§å•æ•°é‡ï¼‰
        //            FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//货主类型
        //            FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" });//货主 
        //            FentityModel.Add("FSrcId", item["FHPOOrderInterID"].ToString());//源单内码
        //            FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//源单类型
        //            FentityModel.Add("FSrcBillNo", item["FHPOOrderBillNo"].ToString());//源单单号
        //            FentityModel.Add("FSRCENTRYID", item["FHPOOrderEntryID"].ToString());//源单分录内码
        //            FentityModel.Add("FORDERBILLNO", item["FHPOOrderBillNo"].ToString());//源单单号
        //            FentityModel.Add("FPOORDERENTRYID", item["FHPOOrderEntryID"].ToString());//源单分录内码
                   

        //            JArray Fentity2 = new JArray();
        //            JObject FentityModel2 = new JObject();
        //            FentityModel2.Add("FDetailEntity_Link_FRULEID", "a8c6b6e5-a8c0-4fc1-8592-6b76c2136cf9");
        //            FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
        //            FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FHPOOrderInterID"].ToString());
        //            FentityModel2.Add("FDetailEntity_Link_FSId", item["FHPOOrderEntryID"].ToString());
        //            Fentity2.Add(FentityModel2);
        //            FentityModel.Add("FDetailEntity_Link", Fentity2);
        //            Fentity.Add(FentityModel);
        //        }
        //        model.Add("FDetailEntity", Fentity); //明细信息

        //        JObject _FentityModel = new JObject();
        //        _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); //  ç»“算组织  
        //        _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FSettleCurrId") as DynamicObject)?["Number"].ToString() ?? "" }); //  ç»“算币别
        //        _FentityModel.Add("FPricePoint", 0); //  å®šä»·æ—¶ç‚¹
        //        model.Add("FinanceEntity ", _FentityModel);//财务信息
        //        JObject jsonRoot = new JObject()
        //        {
        //            ["Creator"] = "",
        //            ["NeedUpDateFields"] = new JArray(),
        //            ["NeedReturnFields"] = new JArray(),
        //            ["IsDeleteEntry"] = "false",
        //            ["SubSystemId"] = "",
        //            ["IsVerifyBaseDataField"] = "false",
        //            //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
        //            ["Model"] = model
        //        };
        //        var result = cloudClient.Save("PUR_ReceiveBill", jsonRoot.ToString());
        //        JObject saveObj = JObject.Parse(result);
        //        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
        //    }
        //    catch (Exception)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "失败 ï¼";
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }

        //}
        #endregion
    }
}

 WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs

@@ -22,7 +22,52 @@
        DataSet ds1;


        #region[编辑时获取表头数据]
        [Route("QC_LastPieceCheckBill/QC_LastPieceCheckBillListCheckDetail")]
        [HttpGet]
        public ApiResult<DataSet> QC_LastPieceCheckBillListCheckDetail(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_QC_LastPieceCheckBillListDetail  where hmainid= " + HID + " ", "h_v_QC_LastPieceCheckBillListDetail");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在结算单号" };

            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        #endregion

        #region[编辑时获取表体数据]
        [Route("QC_LastPieceCheckBill/QC_LastPieceCheckBillListProjectDetai")]
        [HttpGet]
        public object QC_LastPieceCheckBillListProjectDetai(string sqlWhere)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql1 = "SELECT æ—¥æœŸ,单据号,备注,产品内码, äº§å“åç§°" +
                    ", äº§å“åž‹å·, æ£€éªŒå‘˜ä»£ç , æ£€éªŒå‘˜åç§°, åˆ¶å•äºº, åˆ¶å•æ—¥æœŸ" +
                    ", å®¡æ ¸äºº, å®¡æ ¸æ—¥æœŸ, ä¿®æ”¹äºº, ä¿®æ”¹æ—¥æœŸ, å…³é—­äºº, å…³é—­æ—¥æœŸ FROM h_v_QC_LastPieceCheckBillListDetail where 1 = 1 ";
                string sql = sql1 + sqlWhere;
                ds = oCN.RunProcReturn(sql, "h_v_QC_LastPieceCheckBillListDetail");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion

        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
@@ -196,7 +241,36 @@
            objJsonResult.data = null;
            return objJsonResult;
        }

        /// <summary>
        ///删除功能
        /// </summary>
        /// <returns></returns>
        [Route("QC_LastPieceCheckBill/DeltetLastPieceCheckBill")]
        [HttpGet]
        public object DeltetLastPieceCheckBill(string HInterID)
        {
            try
            {
                oCN.BeginTran();
                oCN.RunProc("Delete From QC_LastPieceCheckBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From QC_LastPieceCheckBillSub where HInterID = " + HInterID);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// è¿”回产品入库检验单列表
        ///参数：string sql。

 WebAPI/Controllers/Sc_MouldController.cs

@@ -1480,7 +1480,7 @@

        #endregion

        #region è®¾å¤‡ç»´ä¿®è®°å½•å•ä¿å­˜
        #region è®¾å¤‡ä¿å…»è®°å½•å•ä¿å­˜

        [Route("Sb_EquipMaintainBill/EquipMaintainBill_Save")]
        [HttpPost]
@@ -1497,15 +1497,15 @@
            try
            {
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsSb_MouldRepairWorkBill BillNew = new DAL.ClsSb_MouldRepairWorkBill();
                List<Model.ClsSb_MouldRepairWorkBillMain> mainList = Newtonsoft
                DAL.ClsSb_EquipMaintainBill BillNew = new DAL.ClsSb_EquipMaintainBill();
                List<Model.ClsSb_EquipMaintainBillMain> mainList = Newtonsoft
                    .Json
                    .JsonConvert
                    .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillMain>>(msg1);
                List<Model.ClsSb_MouldRepairWorkBillSub> subList = Newtonsoft
                    .DeserializeObject<List<Model.ClsSb_EquipMaintainBillMain>>(msg1);
                List<Model.ClsSb_EquipMaintainBillSub> subList = Newtonsoft
                    .Json
                    .JsonConvert
                    .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub>>(msg1);
                    .DeserializeObject<List<Model.ClsSb_EquipMaintainBillSub>>(msg1);
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
@@ -1523,27 +1523,23 @@
                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
                BillNew.omodel.HMaker = mainList[0].HMaker;
                BillNew.omodel.HDate = HDate;
                BillNew.omodel.HMouldID = mainList[0].HMouldID;
                BillNew.omodel.HEquipID = mainList[0].HEquipID;
                BillNew.omodel.HDeptID = mainList[0].HDeptID;
                BillNew.omodel.HEmpID = mainList[0].HEmpID;
                BillNew.omodel.HRepairID = mainList[0].HRepairID;
                BillNew.omodel.HManagerID = mainList[0].HManagerID;
                BillNew.omodel.HRepairBeginDate = mainList[0].HRepairBeginDate;
                BillNew.omodel.HRepairEndDate = mainList[0].HRepairEndDate;
                BillNew.omodel.HRepairContent = mainList[0].HRepairContent;
                BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
                BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
                BillNew.omodel.HTimes = mainList[0].HTimes;
                BillNew.omodel.HBeginDate = mainList[0].HBeginDate;
                BillNew.omodel.HEndDate = mainList[0].HEndDate;
                //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
                //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
                //BillNew.omodel.HTimes = mainList[0].HTimes;
                BillNew.omodel.HExplanation = mainList[0].HExplanation;
                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
                BillNew.omodel.HMouldID = mainList[0].HMouldID;
                BillNew.omodel.HSupID = mainList[0].HSupID;
                BillNew.omodel.HRepairType = mainList[0].HRepairType;
                BillNew.omodel.HNewModel = mainList[0].HNewModel;
                BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
                BillNew.omodel.HEquipID = mainList[0].HEquipID;
                BillNew.DetailColl = new List<Model.ClsSb_MouldRepairWorkBillSub>();
                Model.ClsSb_MouldRepairWorkBillSub oSub = new Model.ClsSb_MouldRepairWorkBillSub();
                //BillNew.omodel.HMouldID = mainList[0].HMouldID;
                //BillNew.omodel.HSupID = mainList[0].HSupID;
                //BillNew.omodel.HRepairType = mainList[0].HRepairType;
                //BillNew.omodel.HNewModel = mainList[0].HNewModel;
                //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
                //BillNew.omodel.HEquipID = mainList[0].HEquipID;
                BillNew.DetailColl = new List<Model.ClsSb_EquipMaintainBillSub>();
                Model.ClsSb_EquipMaintainBillSub oSub = new Model.ClsSb_EquipMaintainBillSub();
                oSub.HEntryID = 1;
                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
@@ -1555,10 +1551,215 @@
                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
                oSub.HRepairID = DBUtility.ClsPub.isLong(subList[0].HRepairID);
                oSub.HManagerID = DBUtility.ClsPub.isLong(subList[0].HManagerID);
                oSub.HMoney = DBUtility.ClsPub.isDoule(subList[0].HMoney);
                oSub.HRepairExplanation = DBUtility.ClsPub.isStrNull(subList[0].HRepairExplanation);
                BillNew.DetailColl.Add(oSub);
                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                if (bResult == true)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = ClsPub.sExeReturnInfo + "单据号:" + mainList[0].HBillNo.Trim();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!原因:" + ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion



        #region è®¾å¤‡ç»´ä¿®è®°å½•å•ä¿å­˜

        [Route("Sb_EquipRepairWorkBill/EquipRepairWorkBill_Save")]
        [HttpPost]
        public object EquipRepairWorkBill_Save([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            return objJsonResult = EquipRepairWorkAddBill(msg1);
        }

        public json EquipRepairWorkAddBill(string msg1)
        {
            bool bResult;
            try
            {
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsSb_EquipRepairWorkBill BillNew = new DAL.ClsSb_EquipRepairWorkBill();
                List<Model.ClsSb_EquipRepairWorkBillMain> mainList = Newtonsoft
                    .Json
                    .JsonConvert
                    .DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillMain>>(msg1);
                List<Model.ClsSb_EquipRepairWorkBillSub> subList = Newtonsoft
                    .Json
                    .JsonConvert
                    .DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillSub>>(msg1);
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = mainList[0].HDate;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = s;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                BillNew.omodel.HYear = sYear;
                BillNew.omodel.HPeriod = sPeriod;
                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
                BillNew.omodel.HMaker = mainList[0].HMaker;
                BillNew.omodel.HDate = HDate;
                BillNew.omodel.HEquipID = mainList[0].HEquipID;
                BillNew.omodel.HDeptID = mainList[0].HDeptID;
                BillNew.omodel.HRepairBeginDate = mainList[0].HRepairBeginDate;
                BillNew.omodel.HRepairEndDate = mainList[0].HRepairEndDate;
                //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
                //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
                //BillNew.omodel.HTimes = mainList[0].HTimes;
                BillNew.omodel.HExplanation = mainList[0].HExplanation;
                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
                //BillNew.omodel.HMouldID = mainList[0].HMouldID;
                //BillNew.omodel.HSupID = mainList[0].HSupID;
                //BillNew.omodel.HRepairType = mainList[0].HRepairType;
                //BillNew.omodel.HNewModel = mainList[0].HNewModel;
                //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
                //BillNew.omodel.HEquipID = mainList[0].HEquipID;
                BillNew.DetailColl = new List<Model.ClsSb_EquipRepairWorkBillSub>();
                Model.ClsSb_EquipRepairWorkBillSub oSub = new Model.ClsSb_EquipRepairWorkBillSub();
                oSub.HEntryID = 1;
                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
                oSub.HRepairID = mainList[0].HRepairID;
                BillNew.DetailColl.Add(oSub);
                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                if (bResult == true)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = ClsPub.sExeReturnInfo + "单据号:" + mainList[0].HBillNo.Trim();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!原因:" + ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion


        #region è®¾å¤‡ç‚¹æ£€è®°å½•å•ä¿å­˜

        [Route("Sb_EquipDotCheckBill/EquipDotCheckBill_Save")]
        [HttpPost]
        public object EquipDotCheckBill_Save([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            return objJsonResult = EquipDotCheckAddBill(msg1);
        }

        public json EquipDotCheckAddBill(string msg1)
        {
            bool bResult;
            try
            {
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill();
                List<Model.ClsSb_EquipDotCheckBillMain> mainList = Newtonsoft
                    .Json
                    .JsonConvert
                    .DeserializeObject<List<Model.ClsSb_EquipDotCheckBillMain>>(msg1);
                List<Model.ClsSb_EquipDotCheckBillSub> subList = Newtonsoft
                    .Json
                    .JsonConvert
                    .DeserializeObject<List<Model.ClsSb_EquipDotCheckBillSub>>(msg1);
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = mainList[0].HDate;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = s;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                BillNew.omodel.HYear = sYear;
                BillNew.omodel.HPeriod = sPeriod;
                BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
                BillNew.omodel.HMaker = mainList[0].HMaker;
                BillNew.omodel.HDate = HDate;
                BillNew.omodel.HEquipID = mainList[0].HEquipID;
                BillNew.omodel.HDeptID = mainList[0].HDeptID;
                BillNew.omodel.HBeginDate = mainList[0].HBeginDate;
                BillNew.omodel.HEndDate = mainList[0].HEndDate;
                //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
                //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
                //BillNew.omodel.HTimes = mainList[0].HTimes;
                BillNew.omodel.HExplanation = mainList[0].HExplanation;
                BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
                //BillNew.omodel.HMouldID = mainList[0].HMouldID;
                //BillNew.omodel.HSupID = mainList[0].HSupID;
                //BillNew.omodel.HRepairType = mainList[0].HRepairType;
                //BillNew.omodel.HNewModel = mainList[0].HNewModel;
                //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
                //BillNew.omodel.HEquipID = mainList[0].HEquipID;
                BillNew.DetailColl = new List<Model.ClsSb_EquipDotCheckBillSub>();
                Model.ClsSb_EquipDotCheckBillSub oSub = new Model.ClsSb_EquipDotCheckBillSub();
                oSub.HEntryID = 1;
                oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
                oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
                oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
                oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
                oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
                oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
                oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
                oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
                oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
                oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
                BillNew.DetailColl.Add(oSub);
                bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                if (bResult == true)

 WebAPI/Controllers/SellOutBackController.cs

@@ -246,6 +246,8 @@
        {
            try
            {
                if (String.IsNullOrEmpty(sWhere))
                    sWhere = "and 1 = 1 ";
                ds = webserver.GetKf_PonderationBillMain_Temp(HBillID, HBillType, sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {