From 41c53f7d9e245f90ac125956a3282006cfae1cf8 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 21 七月 2025 09:49:23 +0800
Subject: [PATCH] 退货申请单接口bug修复
---
StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 201 --------------------------------------------------
1 files changed, 0 insertions(+), 201 deletions(-)
diff --git a/StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index 73d3732..c094127 100644
--- a/StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/StandardPda/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -1,209 +1,8 @@
锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
using MES.Service.Modes;
-using SqlSugar;
namespace MES.Service.service.Warehouse;
public class MesInvItemArnDetailManager : Repository<MesInvItemArnDetail>
{
- //var result = db.Ado.GetString($"SELECT f_getseqnextvalue('{sequenceName}') FROM DUAL");
-
- private readonly PurdhbManager purdhbManager = new();
- private readonly PurdkaManager purdkaManager = new();
- private readonly PurdkbManager purdkbManager = new();
-
- private readonly MesQaItemsDetect01Manager rohInDataManager = new();
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemArnDetailManager.cs
-
- public List<MesInvItemArnDetail> GetDetails(WarehouseQuery query)
- {
- // 鏌ヨ
- return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>(
- (c, t, u) => new object[]
- {
- JoinType.Left,
- c.ItemNo == t.ItemNo && c.Company == t.Company &&
- c.Factory == t.Factory,
- JoinType.Left,
- t.Fpurchaseunitid == u.Id.ToString() &&
- t.Factory == u.Factory &&
- t.Company == u.Company
- })
- .Where((c, t, u) => c.Mid == query.id)
- .Select((c, t, u) => new MesInvItemArnDetail
- {
- CheckRes = c.CheckRes,
- itemModel = t.ItemModel,
- itemName = t.ItemName,
- UrgentFlag = c.UrgentFlag,
- Memo = c.Memo,
- Quantity = c.Quantity,
- SubQty = c.SubQty,
- CheckStates = c.CheckStates,
- WorkLine = c.WorkLine,
- IsdepsIn = c.IsdepsIn,
- OkRkqty = c.OkRkqty,
- Fname = u.Fname,
- EbelnQty = c.EbelnQty,
- ItemNo = c.ItemNo,
- Id = c.Id,
- Ebeln = c.Ebeln
- })
- .ToList();
- }
-
- public List<Material> GetMaterial(WarehouseQuery query)
- {
- // 鏌ヨ
- var result = Db
- .Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
- MesItems, MesUnit, MesQaItemsDetectDetail5>(
- (a, d, b, c, t, z) => new object[]
- {
- JoinType.Inner, d.BillNo == a.LotNo,
- JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
- JoinType.Inner,
- a.ItemNo == c.ItemNo && a.Company == c.Company &&
- a.Factory == c.Factory,
- JoinType.Inner, c.Fpurchaseunitid == t.Id.ToString(),
- JoinType.Inner, z.ReleaseNo == a.ReleaseNo
- })
- .Where((a, d, b, c, t, z) => a.FngHandle == "閫�璐�" &&
- z.FcheckResu == "涓嶅悎鏍�" &&
- query.ItemArnDetailIds.Contains(b.Id))
- .Select((a, d, b, c, t) => new Material
- {
- FmrMode = a.Fmrmode,
- FngDesc = a.FngDesc,
- FsrcEntryId = b.Id,
- FrmRealQty = b.Quantity,
- FmaterialId = a.ItemNo,
- FstockId = d.DepotsCode,
- Funit = t.Fnumber,
- FmesEntryId = a.Id,
- Mid = d.Id
- })
- .ToList();
-
- return result;
- }
-
- public bool SetMaterial(Material material)
- {
- var b1 = UseTransaction(db =>
- {
- var executeCommand = db.Updateable<MesInvItemArnDetail>()
- .SetColumns(s => s.CheckRes == "涓嶅悎鏍�")
- .SetColumns(s => s.CheckStates == "閫�璐�")
- .SetColumns(s => s.Ischeck == 1)
- .Where(s =>
- s.Mid == material.Mid && s.ItemNo == material.FmaterialId)
- .ExecuteCommand();
-
- var mesQaItemsDetect01 = db.Queryable<MesQaItemsDetect01>()
- .Where(a => a.Id == material.FmesEntryId).Single();
-
- if (mesQaItemsDetect01 == null) return 0;
-
- var suppName = db.Queryable<MesSupplier>()
- .Where(b => b.SuppNo == mesQaItemsDetect01.SuppNo)
- .Select<string>(b => b.SuppName).First();
-
- var CIdt = db.Ado.GetString(
- "SELECT f_getseqnextvalue('mes_inv_item_ins') FROM DUAL");
-
- var billNo = db.Ado.GetString(
- "SELECT getbillcode1('1000', '1000', 'INV_IN_BACK') FROM DUAL");
-
- // PURDKA
- var purdka = GetPurdka(CIdt, billNo, mesQaItemsDetect01, suppName);
-
- executeCommand += db.Insertable(purdka).ExecuteCommand();
-
- executeCommand += InsertPurdkbs(db, mesQaItemsDetect01, billNo);
-
- executeCommand += db.Updateable<MesQaItemsDetect01>()
- .SetColumns(c => c.Modify1Flag == 1)
- .SetColumns(c => c.Modify1By == material.UserName)
- .SetColumns(c => c.Modify1Date == DateTime.Now)
- .SetColumns(c => c.FngHandle == "閫�璐�")
- .Where(c => c.ReleaseNo == mesQaItemsDetect01.ReleaseNo)
- .ExecuteCommand();
-
- return executeCommand;
- }) >= 4;
-
- if (b1 == false) throw new NotImplementedException("鎺ㄩ�佸け璐ワ紝Mes鏂归潰鍑虹幇闂");
-
- return b1;
- }
-
- private int InsertPurdkbs(SqlSugarScope db,
- MesQaItemsDetect01 mesQaItemsDetect01, string billNo)
- {
- var purdhbs = db.Queryable<Purdhb>()
- .Where(c => c.Dhb001 == mesQaItemsDetect01.LotNo
- && c.Dhb003 == mesQaItemsDetect01.ItemNo)
- .Select(c => new Purdhb
- {
- Dhb002 = c.Dhb002,
- Dhb003 = c.Dhb003,
- Dhb006 = c.Dhb006,
- Dhb007 = c.Dhb007,
- Dhb017 = c.Dhb017,
- Dhb018 = c.Dhb018,
- Dhb001 = c.Dhb001,
- Dhb042 = c.Dhb042
- }).ToList();
-
- var list = new List<Purdkb>();
-
- purdhbs.ForEach(s =>
- {
- var id = db.Ado.GetString(
- "SELECT f_getseqnextvalue('MES_INV_ITEM_IN_C_DETAILS') FROM DUAL");
-
- var purdkb = new Purdkb();
- purdkb.Id = Convert.ToDecimal(id);
- purdkb.Dkb001 = billNo;
- purdkb.Dkb002 = s.Dhb002;
- purdkb.Dkb003 = s.Dhb003;
- purdkb.Dkb006 = s.Dhb006;
- purdkb.Dkb007 = s.Dhb006;
- purdkb.Dkb008 = 0;
- purdkb.Dkb009 = s.Dhb007;
- purdkb.Dkb010 = s.Dhb017;
- purdkb.Dkb011 = s.Dhb018;
- purdkb.Dkb012 = s.Dhb001;
- purdkb.Dkb013 = s.Dhb002;
- purdkb.Dkb016 = s.Dhb042;
-
- list.Add(purdkb);
- });
-
- var insertRange = db.Insertable(list).ExecuteCommand();
-
- return insertRange == purdhbs.Count ? 1 : 0;
- }
-
- private static Purdka GetPurdka(string CIdt, string billNo,
- MesQaItemsDetect01 mesQaItemsDetect01, string suppName)
- {
- var date = DateTime.Now.ToString("yyyy-MM-dd");
- var purdka = new Purdka();
- purdka.Id = Convert.ToDecimal(CIdt);
- purdka.Dka001 = billNo;
- purdka.Dka002 = "閲囪喘閫�璐�";
- purdka.Dka003 = date;
- purdka.Dka004 = date;
- purdka.Dka005 = mesQaItemsDetect01.SuppNo;
- purdka.Dka006 = suppName;
- purdka.Dka010 = "1";
- purdka.Dka013 = 0;
- purdka.Createuser = mesQaItemsDetect01.LastupdateBy;
- return purdka;
- }
}
\ No newline at end of file
--
Gitblit v1.9.3