From c3a050007846b015c11ec53db980831d23e7c3f8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 12 九月 2024 14:08:54 +0800
Subject: [PATCH] 基础资料接口部分实体与erp的对照增加Type字段的赋值，防止根据type分组时报错
---
MES.Service/service/Warehouse/MesInvItemMovesManager.cs | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
index ffd3aae..ce0d8ce 100644
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -15,12 +15,10 @@
public MovesDto ScanInBarcode(WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.sectionCode))
- {
throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
- }
- int pBillTypeId = 300;
- int pTransctionNo = 301;
+ var pBillTypeId = 300;
+ var pTransctionNo = 301;
var depotQuery = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
new JoinQueryInfos(
@@ -30,9 +28,7 @@
.First();
if (depotQuery == null)
- {
throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
- }
var cDepotCode = depotQuery.DepotCode;
@@ -48,10 +44,7 @@
.Select((a, b) => new { a.Id, a.BillNo, a.InvDepotsCode })
.First();
- if (itemMoveQuery == null)
- {
- throw new Exception("鏉＄爜鏈仛璋冩嫈鍑哄簱鎵爜锛岃鏍稿锛�");
- }
+ if (itemMoveQuery == null) throw new Exception("鏉＄爜鏈仛璋冩嫈鍑哄簱鎵爜锛岃鏍稿锛�");
var cBillNo = itemMoveQuery.BillNo;
var iDepotCode = itemMoveQuery.InvDepotsCode;
@@ -66,14 +59,10 @@
.First();
if (depotValidationQuery == null)
- {
throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
- }
if (iDepotCode != depotValidationQuery.DepotCode)
- {
throw new Exception("瀹為檯浠撳簱涓庣敵璇疯皟鍏ヤ粨搴撲笉绗︼紝璇锋牳瀵癸紒");
- }
var barcodeCount = Db.Queryable<MesInvItemMovesCDetails>()
.Where(b =>
@@ -81,19 +70,13 @@
b.ItemMoveId == itemMoveQuery.Id && b.MoveOk == 1)
.Count();
- if (barcodeCount > 0)
- {
- throw new Exception("鏉＄爜璋冩嫈宸插畬鎴愶紝璇锋牳瀵癸紒");
- }
+ if (barcodeCount > 0) throw new Exception("鏉＄爜璋冩嫈宸插畬鎴愶紝璇锋牳瀵癸紒");
var barcodeInfo = Db.Queryable<MesInvItemBarcodes>()
.Where(t => t.ItemBarcode == query.barcode)
.First();
- if (barcodeInfo == null)
- {
- throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
- }
+ if (barcodeInfo == null) throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
var isAudit = UseTransaction(db =>
{
@@ -140,15 +123,12 @@
.Where(a => a.ItemMoveId == itemMoveQuery.Id && a.MoveOk == 1)
.Sum(a => SqlFunc.IsNull(a.Quantity, 0));
- if (totalQuantity == scannedQuantity)
- {
- return 1;
- }
+ if (totalQuantity == scannedQuantity) return 1;
return 0;
});
- MovesDto dto = new MovesDto();
+ var dto = new MovesDto();
dto.InAudit = isAudit == 1;
dto.BarcodesInfo = barcodeInfo;
return dto;
@@ -180,7 +160,7 @@
public MovesDto GetItems(WarehouseQuery query)
{
- MovesDto dto = new MovesDto();
+ var dto = new MovesDto();
dto.BarcodeList = GetItemMovesCDetails(query);
dto.OutItems = GetItemOutItems(query);
@@ -191,7 +171,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,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}",
+ "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);
@@ -287,7 +267,7 @@
if (sumqty > quantity)
throw new Exception(
"宸叉壂鏉＄爜鏁伴噺鎴栨湰娆℃壂鐮佹暟閲忥細" + sumqty + " 澶т簬鐢宠鏁伴噺锛�" + quantity + "锛岃鏍稿锛�");
-
+
UseTransaction(db =>
{
SaveMesInvItemMovesCDetails(db, query, mesInvItemMoves,
--
Gitblit v1.9.3