From 2812f65c7481ce10953fa1fbe9cc89a8768e07f6 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期三, 23 四月 2025 17:13:55 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda
---
MES.Service/service/BasicData/MesItemsManager.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 2d42a7b..fa57d25 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,4 +1,5 @@
锘縰sing MES.Service.DB;
+using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -7,6 +8,15 @@
public class MesItemsManager : Repository<MesItems>
{
+ public MesItems GetItemQcPrint(WarehouseQuery query)
+ {
+ return Db.Queryable<MesItems>()
+ .Where(c => c.Factory == query.Factory
+ && c.Company == query.Company
+ && c.ItemNo == query.ItemNo).First();
+ }
+
+
public bool Save(ErpItems item)
{
var entity = GetMesItems(item);
@@ -120,6 +130,7 @@
return new MesItems
{
Id = Convert.ToDecimal(item.Id),
+ Type = item.Type,
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
@@ -135,7 +146,7 @@
Fissuetype = item.FIssueType,
Fisbatchmanage = item.FIsBatchManage,
Fpurchaserid = item.FPurchaserId,
- Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
+ Fpurchaseunitid = item.FPurchaseUnitId,
Storeunit = item.FStoreUnitID,
Saleunit = item.FSaleUnitId,
Fforbidstatus = item.FForbidStatus,
@@ -143,8 +154,12 @@
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
SubconUnit = item.FSUBCONUNITID,
+ CreateDate = DateTime.Now,
Company = "1000",
- Factory = "1000"
+ Factory = "1000",
+ CheckbosSFBZ = item.F_UNW_CheckBox_SFBZ,
+ CheckbosSFDB = item.F_UNW_CheckBox_SFDB
+
};
}
--
Gitblit v1.9.3