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

zzr99

2022-01-21 d1ff6d3f77431b15feb72688a280f80b89fb68d6

 WebAPI/Controllers/Kf_EntrustInBillController.cs

@@ -35,7 +35,7 @@
        public bool sRedBlueFlag = false;
        public bool SourceFlag = false;
        //public string sSourceType = "1601";
       // public bool sRedBlue = false;
        // 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();
@@ -82,24 +82,11 @@
            try
            {
                ds = webserver.GetKf_PonderationBillMain_TempList(HBillType, sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {

                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -119,7 +106,7 @@
        [HttpGet]
        public Object get_CheckTypeByBarCode_All_Json(string sCode, Int64 sInterID, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID, string sExpressNumber)
        {
            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";
@@ -178,13 +165,14 @@
                return objJsonResult;
            }
        }

        /// <summary>
        /// 生成委外入库单
        /// </summary>
        /// <returns></returns>
        [Route("Kf_EntrustInBill/set_SaveEntrustInBill_Json")]
        [HttpPost]
        public object set_SaveEntrustInBill_Json([FromBody]JObject oMain)
        public object set_SaveEntrustInBill_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
@@ -255,7 +243,7 @@
        /// <returns></returns>
        [Route("Kf_EntrustInBill/set_SaveEntrustInBill_New_Json")]
        [HttpPost]
        public object set_SaveEntrustInBill_New_Json([FromBody]JObject oMain)
        public object set_SaveEntrustInBill_New_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
@@ -398,7 +386,7 @@
        /// <returns></returns>
        [Route("Kf_EntrustInBill/set_SaveEntrustInBackBill_Json")]
        [HttpPost]
        public object set_SaveEntrustInBackBill_Json([FromBody]JObject oMain)
        public object set_SaveEntrustInBackBill_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();