From f0a4bf92677c1449113106439551d77013853cba Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期四, 15 八月 2024 16:42:28 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/Warehouse/MesInvItemMovesManager.cs | 36 +++++++++++++++++++++++++++++++++++-
MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs | 24 +-----------------------
2 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
index 0da91c7..912ebd5 100644
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -12,6 +12,40 @@
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemMovesManager.cs
+ public int ScanInBarcode(WarehouseQuery query)
+ {
+ if (string.IsNullOrEmpty(query.sectionCode))
+ {
+ throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
+ }
+
+ int pBillTypeId = 300;
+ int pTransctionNo = 301;
+
+ var depotQuery = Db.Queryable<MesDepotSections, MesDepots>((a, b) => new JoinQueryInfos(
+ JoinType.Inner, a.Zuid.ToString() == b.Zuid))
+ .Where((a, b) => a.DepotSectionCode == query.sectionCode)
+ .Select((a, b) => new { b.DepotCode })
+ .First();
+
+ if (depotQuery == null)
+ {
+ throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
+ }
+
+ var cDepotCode = depotQuery.DepotCode;
+
+ // 鏌ヨ璋冩嫈鍏ュ簱淇℃伅
+ var itemMoveQuery = Db.Queryable<MesInvItemMoves, MesInvItemMovesCDetails>((a, b) => new JoinQueryInfos(
+ JoinType.Inner, a.Id == b.ItemMoveId))
+ .Where((a, b) => b.ItemBarcode == query.barcode && a.BillTypeId == pBillTypeId && a.TransactionNo == pTransctionNo &&
+ a.Status == 1 && SqlFunc.IsNull(b.MoveOk, 0) != 1)
+ .Select((a, b) => new { a.Id, a.BillNo, a.InvDepotsCode })
+ .First();
+
+ return 0;
+ }
+
public List<MesInvItemMoves> GetBillNo(WarehouseQuery query)
{
query.Factory = "1000";
@@ -48,7 +82,7 @@
private List<MesInvItemOutItems> GetItemOutItems(WarehouseQuery query)
{
var sql = string.Format(
- "SELECT C.ITEM_NO, C.QUANTITY, C.REMARK, C.REMARK, S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID LEFT JOIN MES_UNIT U ON U.ID = S.ITEM_UNIT LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK FROM MES_INV_ITEM_MOVES_C_DETAILS GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO where C.ITEM_OUT_ID= {0}",
+ "SELECT C.ITEM_NO, C.QUANTITY, C.REMARK, C.REMARK, S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK, NVL(ST.QUANTITY, 0) WLKC FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID LEFT JOIN MES_UNIT U ON U.ID = S.ITEM_UNIT LEFT JOIN MES_DEPOTS P ON P.DEPOT_CODE = C.DEPOT_CODE LEFT JOIN MES_DEPOT_SECTIONS E ON E.DEPOT_SECTION_CODE = C.DEPOT_SECTION_CODE LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK FROM MES_INV_ITEM_MOVES_C_DETAILS GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO LEFT JOIN MES_INV_ITEM_MOVES A ON A.ID = C.ITEM_OUT_ID left join (SELECT ITEM_ID, SUM(QUANTITY) QUANTITY, DEPOTS_CODE FROM MES_INV_ITEM_STOCKS GROUP BY ITEM_ID, DEPOTS_CODE) ST ON C.ITEM_ID = ST.ITEM_ID AND ST.DEPOTS_CODE = A.FROM_DEPOTS_CODE where C.ITEM_OUT_ID = {0}",
query.id);
return Db.Ado.SqlQuery<MesInvItemOutItems>(sql);
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
index 2ff4d38..269d338 100644
--- a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
+++ b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
@@ -96,29 +96,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
- //ScanOutShowDb
- [HttpPost("ScanOutShowDb")]
- public ResponseResult ScanOutShowDb(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetBillNo(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
+
/// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
--
Gitblit v1.9.3