From bea649e648da6d97041ba5aedac0c66ac8a877f0 Mon Sep 17 00:00:00 2001 From: cdk <2441919651@qq.com> Date: 星期四, 28 八月 2025 09:56:00 +0800 Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/NewPdaSqlServer --- Controllers/Warehouse/MesBarCFController.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/Controllers/Warehouse/MesBarCFController.cs b/Controllers/Warehouse/MesBarCFController.cs index 33abddd..3199bfb 100644 --- a/Controllers/Warehouse/MesBarCFController.cs +++ b/Controllers/Warehouse/MesBarCFController.cs @@ -47,6 +47,31 @@ /// 鑾峰彇鏉$爜淇℃伅鍜岀墿鏂欎俊鎭� /// </summary> /// <returns></returns> + [HttpPost("GetBarInfoBefore")] + public ResponseResult GetBarInfoBefore(WarehouseQuery unity) + { + try + { + dynamic resultInfos = new ExpandoObject(); + resultInfos.tbBillList = m.GetBarInfoBefore(unity); + resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ITEM_ID); + return new ResponseResult + { + status = 0, + message = "OK", + data = resultInfos + }; + } + catch (Exception ex) + { + return ResponseResult.ResponseError(ex); + } + } + + /// <summary> + /// 鑾峰彇鏉$爜淇℃伅鍜岀墿鏂欎俊鎭� + /// </summary> + /// <returns></returns> [HttpPost("BarCF")] public ResponseResult BarCF(WarehouseQuery unity) { @@ -69,4 +94,32 @@ return ResponseResult.ResponseError(ex); } } + + + /// <summary> + /// 鑾峰彇鏉$爜淇℃伅鍜岀墿鏂欎俊鎭� + /// </summary> + /// <returns></returns> + [HttpPost("BarCfBefore")] + public ResponseResult BarCfBefore(WarehouseQuery unity) + { + try + { + dynamic resultInfos = new ExpandoObject(); + resultInfos.tbBillList = new ExpandoObject(); + resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity); + var scanResult = m.BarCfBefore(unity); + resultInfos.tbBillList.cfBarInfo = _mCf.getCfBeforeInfo(scanResult); + return new ResponseResult + { + status = 0, + message = "OK", + data = resultInfos + }; + } + catch (Exception ex) + { + return ResponseResult.ResponseError(ex); + } + } } \ No newline at end of file -- Gitblit v1.9.3