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

zzr99

2021-12-17 e3bff146a97648a9e2b7ec988cfc1ebe4c19b372

 WebAPI/Controllers/²©ÈÕ×Ô¶¯É¨ÂëÏß/ScanlineAPIController.cs

@@ -225,8 +225,8 @@
                oCN.RunProc("Delete From Sc_PackUnionBillSub  where HBarCode_Pack=" + packagebarcode.ToString());
                //删除主表
                oCN.RunProc("Delete From Sc_PackUnionBillMain  where HBarCode_Pack=" + packagebarcode.ToString());
                //删除条码档案表
                oCN.RunProc("Delete From Gy_BarCodeBill  where HBarCode=" + packagebarcode.ToString());
                //作废条码档案表
                oCN.RunProc("Update  Gy_BarCodeBill set HStopflag='1'  where HBarCode=" + packagebarcode.ToString());

                oCN.Commit();

@@ -244,5 +244,29 @@
            }
        }
        #endregion


        [Route("packagebarcode/week")]
        [HttpPost]
        public object week(string tim)
        {
            try
            {
                GetWeekList list = new GetWeekList();
                //string aa=list.getWeek(Convert.ToDateTime(tim));
                string aa = list.GetCodeDateStr(Convert.ToDateTime(tim));
                objJsonResult.status = 0;
                objJsonResult.msg =aa.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.status = -1;
                objJsonResult.msg = e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
    }
}