From 250ae3deeabd8e0818f4adf57f747b71fefd5ef3 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期一, 30 十二月 2024 16:54:56 +0800 Subject: [PATCH] 11 --- service/Warehouse/MesItemQtManager.cs | 108 ++++++++--------------------------------------------- 1 files changed, 17 insertions(+), 91 deletions(-) diff --git a/service/Warehouse/MesItemQtManager.cs b/service/Warehouse/MesItemQtManager.cs index 01ce4e1..83730c5 100644 --- a/service/Warehouse/MesItemQtManager.cs +++ b/service/Warehouse/MesItemQtManager.cs @@ -24,7 +24,7 @@ } /// <summary> - /// 鑾峰彇寰呭鐞嗙殑閫�鏂欏崟鏄庣粏鍒楄〃 + /// 鑾峰彇寰呭鐞嗙殑閫�鏂欏崟鏄庣粏鍒楄〃 /// </summary> /// <param name="query">浠撳簱鏌ヨ鍙傛暟锛屽寘鍚敤鎴峰悕鍜屽崟鎹彿</param> /// <returns>寰呭鐞嗙殑閫�鏂欏崟鏄庣粏鍒楄〃</returns> @@ -40,22 +40,15 @@ .First(); // 濡傛灉鏈壘鍒伴��鏂欏崟锛屾姏鍑哄紓甯� - if (mesItemQt == null) - { - throw new Exception($"鏈煡璇㈠埌姝ゅ叾浠栧叆搴撶敵璇峰崟 {p_bill_no}"); - } + if (mesItemQt == null) throw new Exception($"鏈煡璇㈠埌姝ゅ叾浠栧叆搴撶敵璇峰崟 {p_bill_no}"); // 妫�鏌ラ��鏂欏崟鐨勫鏍哥姸鎬�(Qt015)锛屾湭瀹℃牳鍒欐姏鍑哄紓甯� if (mesItemQt.Qt015 == false) - { throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 鏈鏍革紝璇风‘璁わ紒"); - } // 妫�鏌ラ��鏂欏崟鐨勫畬缁撶姸鎬�(Qt014)锛屽凡瀹岀粨鍒欐姏鍑哄紓甯� if (mesItemQt.Qt014 == true) - { throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 宸插畬缁擄紝璇风‘璁わ紒"); - } // 鑱旇〃鏌ヨ鑾峰彇鏈畬鎴愮殑鏄庣粏鍒楄〃 // 鍏宠仈琛細 @@ -97,10 +90,7 @@ var p_transaction_no = 202; // 妫�鏌ュ崟鎹彿鏄惁涓虹┖ - if (string.IsNullOrEmpty(p_bill_no)) - { - throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒"); - } + if (string.IsNullOrEmpty(p_bill_no)) throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒"); // 妫�鏌ユ槸鍚﹂噸澶嶆壂鎻� var existingBarcode = Db.Queryable<MesInvItemOutCDetails>() @@ -108,10 +98,7 @@ it.ItemBarcode == p_item_barcode && it.PbillNo == p_bill_no) .Any(); - if (existingBarcode) - { - throw new Exception("姝ゆ潯鐮佸凡缁忔壂鐮佸嚭搴�,鍕块噸澶嶆壂鎻忥紒"); - } + if (existingBarcode) throw new Exception("姝ゆ潯鐮佸凡缁忔壂鐮佸嚭搴�,鍕块噸澶嶆壂鎻忥紒"); // 鑾峰彇鏉$爜淇℃伅 var barcode = Db.Queryable<MesInvItemBarcodes>() @@ -119,9 +106,7 @@ .First(); if (barcode == null) - { throw new Exception($"mes涓笉瀛樺湪姝ゆ潯鐮�,璇锋牳瀵癸紒{p_item_barcode}"); - } // 鑾峰彇搴撳瓨淇℃伅 var stock = Db.Queryable<MesInvItemStocks>() @@ -129,20 +114,14 @@ .First(); if (stock == null) - { throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮侊紝璇锋鏌ユ潯鐮佹槸鍚︽湭鍏ュ簱鎴栧凡鍑哄簱锛亄p_item_barcode}"); - } if (string.IsNullOrEmpty(stock.DepotsCode)) - { throw new Exception($"璋冩嫧涓殑鏉$爜涓嶅彲鍙戞枡,璇峰厛瀹屾垚璋冩嫧鍗曟嵁{p_item_barcode}"); - } if (stock.DepotsCode is "S006" or "S005") - { throw new Exception($"鏉$爜鍦ㄤ笉鑹搧浠撲笅 涓嶅彲鍙戞枡{p_item_barcode}"); - } // 妫�鏌ユ槸鍚﹀湪瀵勫瓨浠撲綅 // var isDepotSection = Db.Queryable<MesJcDepot>() @@ -160,16 +139,12 @@ .First(); if (mesItemQt == null) - { throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 涓嶅瓨鍦紝璇风‘璁わ紒"); - } // 妫�鏌ヤ粨搴撴槸鍚︿竴鑷� if (mesItemQt.Qt011 != stock.DepotsCode) - { throw new Exception( $"鎵爜鍑鸿揣浠撳簱{stock.DepotsCode}涓庡叾浠栧嚭搴撶敵璇蜂粨搴搟mesItemQt.Qt011}涓嶄竴鑷达紝璇锋牳瀵癸紒"); - } // 鑾峰彇鍑哄簱鍗曟槑缁� var qtDetail = Db.Queryable<MesItemQtDatall>() @@ -178,17 +153,12 @@ it.ItemId == stock.ItemId.ToString()) .First(); - if (qtDetail == null) - { - throw new Exception("鎵爜鐗╂枡闈炴湰娆″嚭搴撶敵璇风墿鏂欙紝璇锋牳瀵癸紒"); - } + if (qtDetail == null) throw new Exception("鎵爜鐗╂枡闈炴湰娆″嚭搴撶敵璇风墿鏂欙紝璇锋牳瀵癸紒"); // 妫�鏌ュ墿浣欐暟閲� var remainingQty = (qtDetail.Qd007 ?? 0) - (qtDetail.Qd008 ?? 0); if (remainingQty <= 0) - { throw new Exception($"鐢宠鐗╂枡 {barcode.ItemNo} 宸插嚭搴撳畬鎴愶紒"); - } // 妫�鏌ユ暟閲忔槸鍚﹁秴鍑� if (stock.Quantity > remainingQty) @@ -295,10 +265,7 @@ it.ItemId == stock.ItemId.ToString()) .First(); - if (qtDetail == null) - { - throw new Exception($"鏈壘鍒板搴旂殑閫�鏂欏崟鏄庣粏淇℃伅"); - } + if (qtDetail == null) throw new Exception("鏈壘鍒板搴旂殑閫�鏂欏崟鏄庣粏淇℃伅"); // 妫�鏌ユ槸鍚﹀凡瀛樺湪鍑哄簱鐗╂枡璁板綍 var existingOutItem = Db.Queryable<MesInvItemOutItems>() @@ -329,7 +296,7 @@ ItemId = !string.IsNullOrEmpty(qtDetail.ItemId) ? long.Parse(qtDetail.ItemId) : null, - FType = 0, + FType = 0 // Unit = qtDetail.Qd009 }; @@ -429,12 +396,10 @@ // 妫�鏌ユ槑缁嗘槸鍚﹀畬鎴�,濡傛灉瀹屾垚鍒欐洿鏂扮姸鎬� if ((qtDetail.Qd007 ?? 0) - (qtDetail.Qd008 ?? 0) == stock.Quantity) - { commit += db.Updateable<MesItemQtDatall>() .SetColumns(it => it.Qd011 == 1) .Where(it => it.Guid == qtDetail.Guid) .ExecuteCommand(); - } mesItemQtDatalls = Db .Queryable<MesItemQt, MesItemQtDatall, MesItems>( @@ -456,12 +421,10 @@ // 濡傛灉娌℃湁寰呭鐞嗘槑缁嗭紝鏇存柊閫�鏂欏崟鐘舵�佷负宸插畬鎴� if (CollectionUtil.IsNullOrEmpty(mesItemQtDatalls)) - { db.Updateable<MesItemQt>() .SetColumns(it => it.Qt014 == true) .Where(it => it.Qtck == p_bill_no) .ExecuteCommand(); - } // 鏋勫缓杩斿洖娑堟伅 mess = $"鎵爜鎴愬姛锛佹潯鐮� {p_item_barcode} 鏁伴噺 {stock.Quantity} 宸插嚭搴�"; @@ -471,10 +434,7 @@ query.Num = stock.Quantity; query.Fum = null; - if (commit < 5) - { - throw new Exception("鏇存柊澶辫触"); - } + if (commit < 5) throw new Exception("鏇存柊澶辫触"); return commit; }); @@ -494,16 +454,10 @@ var p_transaction_no = 202; // 妫�鏌ュ崟鎹彿鏄惁涓虹┖ - if (string.IsNullOrEmpty(p_bill_no)) - { - throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒"); - } + if (string.IsNullOrEmpty(p_bill_no)) throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒"); // 妫�鏌ユ暟閲忔槸鍚︽湁鏁� - if (p_qty <= 0) - { - throw new Exception("璇疯緭鍏ユ纭殑鍙戞枡鏁伴噺锛�"); - } + if (p_qty <= 0) throw new Exception("璇疯緭鍏ユ纭殑鍙戞枡鏁伴噺锛�"); // 鑾峰彇搴撳瓨鏉$爜淇℃伅 var stock = Db.Queryable<MesInvItemStocks>() @@ -511,19 +465,13 @@ .First(); if (stock == null) - { throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮侊紝璇锋鏌ユ潯鐮佹槸鍚︽湭鍏ュ簱鎴栧凡鍑哄簱锛亄p_old_barcode}"); - } if (string.IsNullOrEmpty(stock.DepotsCode)) - { throw new Exception($"璋冩嫧涓殑鏉$爜涓嶅彲鍙戞枡,璇峰厛瀹屾垚璋冩嫧鍗曟嵁{p_old_barcode}"); - } if (stock.DepotsCode is "S006" or "S005") - { throw new Exception($"鏉$爜鍦ㄤ笉鑹搧浠撲笅 涓嶅彲鍙戞枡{p_old_barcode}"); - } // 鑾峰彇鏉$爜淇℃伅 var barcode = Db.Queryable<MesInvItemBarcodes>() @@ -531,9 +479,7 @@ .First(); if (barcode == null) - { throw new Exception($"mes涓笉瀛樺湪姝ゆ潯鐮侊紝璇锋牳瀵癸紒{p_old_barcode}"); - } // 鑾峰彇閫�鏂欏崟淇℃伅 var mesItemQt = Db.Queryable<MesItemQt>() @@ -541,15 +487,11 @@ .First(); if (mesItemQt == null) - { throw new Exception($"鍏朵粬鍑哄簱鐢宠鍗� {p_bill_no} 涓嶅瓨鍦紝璇风‘璁わ紒"); - } if (mesItemQt.Qt011 != stock.DepotsCode) - { throw new Exception( $"鎵爜鍑鸿揣浠撳簱{stock.DepotsCode}涓庡叾浠栧嚭搴撶敵璇蜂粨搴搟mesItemQt.Qt011}涓嶄竴鑷达紝璇锋牳瀵癸紒"); - } // 鑾峰彇閫�鏂欏崟鏄庣粏 var qtDetail = Db.Queryable<MesItemQtDatall>() @@ -558,32 +500,23 @@ it.ItemId == stock.ItemId.ToString()) .First(); - if (qtDetail == null) - { - throw new Exception("鎵爜鐗╂枡闈炴湰娆″嚭搴撶敵璇风墿鏂欙紝璇锋牳瀵癸紒"); - } + if (qtDetail == null) throw new Exception("鎵爜鐗╂枡闈炴湰娆″嚭搴撶敵璇风墿鏂欙紝璇锋牳瀵癸紒"); var remainingQty = (qtDetail.Qd007 ?? 0) - (qtDetail.Qd008 ?? 0); if (remainingQty <= 0) - { throw new Exception($"鐢宠鐗╂枡 {barcode.ItemNo} 宸插嚭搴撳畬鎴愶紒"); - } if (p_qty > remainingQty) - { throw new Exception( $"杈撳叆鐨勬媶鍒嗘暟閲� {p_qty} 涓嶅彲澶т簬鍓╀綑闇�鍙戞暟閲� {remainingQty} 璇蜂慨鏀�"); - } var totalQty = Db.Queryable<MesInvItemStocks>() .Where(it => it.ItemBarcode == p_old_barcode && it.Quantity > 0) .Sum(it => it.Quantity); if (totalQty < p_qty) - { throw new Exception($"杈撳叆鐨勫彂鏂欐暟閲� {p_qty} 涓嶅彲澶т簬鏉$爜鏁伴噺 {totalQty} 璇蜂慨鏀�"); - } var message = string.Empty; var mesItemQtDatalls = new List<MesItemQtDatall>(); @@ -633,7 +566,7 @@ ComeFlg = 5, EbelnK3id = barcode.EbelnK3id, LineK3id = barcode.LineK3id, - ItemId = barcode.ItemId, + ItemId = barcode.ItemId }).IgnoreColumns(true).ExecuteCommand(); // 鏇存柊鍘熸潯鐮佹暟閲� @@ -667,7 +600,7 @@ BillNo = stock.BillNo, EbelnK3id = stock.EbelnK3id, LineK3id = stock.LineK3id, - ItemId = stock.ItemId, + ItemId = stock.ItemId }).IgnoreColumns(true).ExecuteCommand(); @@ -702,7 +635,7 @@ LineK3id = stock.LineK3id, SuppId = stock.SuppId, SuppNo = stock.SuppNo, - ItemId = stock.ItemId, + ItemId = stock.ItemId }).IgnoreColumns(true).ExecuteCommand(); } else @@ -733,7 +666,7 @@ commit += db.Insertable(new MesInvItemOuts { Guid = outId, - ItemOutNo = $"OUT-{DateTime.Now:yyyyMMddHHmmss}", + ItemOutNo = outNo, TaskNo = p_bill_no, Status = 0, CreateBy = c_user, @@ -751,9 +684,8 @@ PbillNo = p_bill_no, OutDate = DateTime.Now, Nflag = 0, - Reason = mesItemQt.Qt010, + Reason = mesItemQt.Qt010 }).ExecuteReturnIdentity(); - outNo = $"OUT-{DateTime.Now:yyyyMMddHHmmss}"; } else { @@ -768,7 +700,6 @@ .First(); if (outItem == null) - { // 鎻掑叆鏂版槑缁� db.Insertable(new MesInvItemOutItems { @@ -789,12 +720,10 @@ ItemId = !string.IsNullOrEmpty(qtDetail.ItemId) ? long.Parse(qtDetail.ItemId) : null, - FType = 0, + FType = 0 // Unit = qtDetail.Qd009 }).ExecuteCommand(); - } else - { // 鏇存柊鏄庣粏鏁伴噺 db.Updateable<MesInvItemOutItems>() .SetColumns(it => @@ -804,7 +733,6 @@ it.ItemId == stock.ItemId && it.QtOutId == qtDetail.Guid) .ExecuteCommand(); - } // 鎻掑叆鍑哄簱鏄庣粏 db.Insertable(new MesInvItemOutCDetails @@ -887,12 +815,10 @@ // 濡傛灉鎵�鏈夋槑缁嗗畬鎴愶紝鏇存柊閫�鏂欏崟鐘舵�� if (!hasUnfinished) - { db.Updateable<MesItemQt>() .SetColumns(it => it.Qt014 == true) .Where(it => it.Qtck == p_bill_no) .ExecuteCommand(); - } // 鑾峰彇鍓╀綑寰呭鐞嗘槑缁� mesItemQtDatalls = db -- Gitblit v1.9.3