diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs
index ea522406e..0bdeb4e58 100644
--- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs
+++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TransferNoteConverter.cs
@@ -19,6 +19,7 @@ public class TransferNoteConverter : IOutgoingConverter
{
private readonly string billtype_s = "4002";
private readonly string billtype_w = "4033";
+ private readonly string billtype_issue = "4026";//线边仓领料单
private readonly IOutgoingFromWmsManager _outgoingFromWmsManager;
private readonly IOutgoingToExternalManager _outgoingToExternalManager;
private readonly IDepartmentAppService _departmentAppService;
@@ -77,11 +78,20 @@ public class TransferNoteConverter : IOutgoingConverter
if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString())
{
outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString();
- var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w);
+ var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w, billtype_s);
outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteScontrol);
WipDetails =details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode , r.ToLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode, ToLocationErpCode=p.Key.ToLocationErpCode }).ToList();
+ }
+ else if (exchangeReceipt.Type != EnumTransSubType.Depot_Issue_WIP.ToString())//立库生成的线边仓领料单
+ {
+ outgoingToExternal.DataType = EnumOutgoingDataType.TransferForErp.ToString();
+ var putawayNoteScontrol = BuildScontrolDataInterface(exchangeReceipt, dt_w, billtype_issue);
+ outgoingToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteScontrol);
+
+ WipDetails = details.GroupBy(r => new { r.Number, r.ItemCode, r.FromLocationErpCode, r.ToLocationErpCode }).Select(p => new TransferNoteDetailExchangeDto { Qty = p.Sum(itm => itm.Qty), Number = p.Key.Number, ItemCode = p.Key.ItemCode, FromLocationErpCode = p.Key.FromLocationErpCode, ToLocationErpCode = p.Key.ToLocationErpCode }).ToList();
+
}
else
{
@@ -119,7 +129,12 @@ public class TransferNoteConverter : IOutgoingConverter
if (exchangeReceipt.Type != EnumTransSubType.Transfer_Customer.ToString())
{
- var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(exchangeReceipt, detail, dt_w);
+ var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(exchangeReceipt, detail, dt_w, billtype_s);
+ outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailScmsend);
+ }
+ else if (exchangeReceipt.Type != EnumTransSubType.Depot_Issue_WIP.ToString())//立库生成的线边仓领料单
+ {
+ var putawayNoteDetailScmsend = BuildScmsendDataInterfaceDetail(exchangeReceipt, detail, dt_w, billtype_issue);
outgoingDetailToExternal.DestinationDataContent = JsonSerializer.Serialize(putawayNoteDetailScmsend);
}
else
@@ -146,7 +161,7 @@ public class TransferNoteConverter : IOutgoingConverter
///
///
///
- private Scontrol BuildScontrolDataInterface(TransferNoteExchangeDto exchangeOrder, string dt_w)
+ private Scontrol BuildScontrolDataInterface(TransferNoteExchangeDto exchangeOrder, string dt_w,string type)
{
var ret = new Scontrol()
{
@@ -154,7 +169,7 @@ public class TransferNoteConverter : IOutgoingConverter
scontrol_dt_w = dt_w,
scontrol_stat = "Y",
scontrol_dt_k = "",
- scontrol_type = billtype_s,
+ scontrol_type = type,
scontrol_id = 0,//明细中最大scmsend_id
};
return ret;
@@ -165,11 +180,11 @@ public class TransferNoteConverter : IOutgoingConverter
///
///
///
- private Scmsend BuildScmsendDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w)
+ private Scmsend BuildScmsendDataInterfaceDetail(TransferNoteExchangeDto exchangeOrder, TransferNoteDetailExchangeDto exchangeDetailOrder, string dt_w,string type)
{
var ret = new Scmsend()
{
- scmsend_type = billtype_s,
+ scmsend_type = type,
scmsend_dt_w = dt_w,
scmsend_nbr = exchangeOrder.Number,
scmsend_stat1 = "0",
diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
index f33a7441d..1ed6a0dad 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
@@ -32,6 +32,13 @@ public class JobController : AbpController
private readonly IPutawayJobAppService _putawayJobAppService;
private readonly IProductionReturnJobAppService _productionReturnJobAppService;
private readonly IThirdLocationJobAppService _thirdLocationJobAppService;
+ private readonly IContainerJobAppService _containerJobAppService;
+ private readonly IInjectionIssueJobAppService _injectionIssueJobAppService;
+ private readonly IInjectionPlanJobAppService _injectionPlanJobAppService;
+ private readonly ICoatingIssueJobAppService _coatingIssueJobAppService;
+ private readonly IAssembleIssueJobAppService _assembleIssueJobAppService;
+ private readonly IKittingIssueJobAppService _kittingIssueJobAppService;
+ private readonly ISparePartIssueJobAppService _sparePartIssueJobAppService;
///
///
@@ -56,7 +63,14 @@ public class JobController : AbpController
IPurchaseReturnJobAppService purchaseReturnJobAppService,
IPutawayJobAppService putawayJobAppService,
IProductionReturnJobAppService productionReturnJobAppService,
- IThirdLocationJobAppService thirdLocationJobAppService)
+ IThirdLocationJobAppService thirdLocationJobAppService,
+ IContainerJobAppService containerJobAppService,
+ IInjectionIssueJobAppService injectionIssueJobAppService,
+ IInjectionPlanJobAppService injectionPlanJobAppService,
+ ICoatingIssueJobAppService coatingIssueJobAppService,
+ IAssembleIssueJobAppService assembleIssueJobAppService,
+ IKittingIssueJobAppService kittingIssueJobAppService,
+ ISparePartIssueJobAppService sparePartIssueJobAppService)
{
_userWorkGroupAppService = userWorkGroupAppService;
_countJobAppService = countJobAppService;
@@ -69,6 +83,13 @@ public class JobController : AbpController
_putawayJobAppService = putawayJobAppService;
_productionReturnJobAppService = productionReturnJobAppService;
_thirdLocationJobAppService = thirdLocationJobAppService;
+ _containerJobAppService = containerJobAppService;
+ _injectionIssueJobAppService = injectionIssueJobAppService;
+ _injectionPlanJobAppService = injectionPlanJobAppService;
+ _coatingIssueJobAppService = coatingIssueJobAppService;
+ _assembleIssueJobAppService = assembleIssueJobAppService;
+ _kittingIssueJobAppService = kittingIssueJobAppService;
+ _sparePartIssueJobAppService = sparePartIssueJobAppService;
}
///
@@ -81,24 +102,39 @@ public class JobController : AbpController
var wlgCodes = await _userWorkGroupAppService.GetUserWorkGroupAsync(userId).ConfigureAwait(false);
var jsonCodes = JsonSerializer.Serialize(wlgCodes.Select(p=>p.WorkGroupCode));
- var status = new List() { EnumJobStatus.Open,EnumJobStatus.Doing };
+ var status = new List() { EnumJobStatus.Open,EnumJobStatus.Doing, EnumJobStatus.Partial};
var jsonStatus = JsonSerializer.Serialize(status);
var list = new List();
-
- var countJobs = await _countJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ //盘点有箱码 (原料盘点)
+ var countJobs_ByPackingCode = await _countJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
{
Filters = new List
{
new(nameof(CountJobDTO.WorkGroupCode),jsonCodes,"In"),
- new(nameof(CountJobDTO.JobStatus),jsonStatus,"In")
+ new(nameof(CountJobDTO.JobStatus),jsonStatus,"In"),
+ new(nameof(CountJobDTO.InventoryMode),EnumInventoryMode.ByPackingCode.ToString())
}
}
}).ConfigureAwait(false);
- list.Add(new JobCountDto { JobType = EnumJobType.CountJob, Count = countJobs });
-
+ list.Add(new JobCountDto { JobType = EnumJobType.CountJob_ByPackingCode, Count = countJobs_ByPackingCode });
+ //盘点无箱码 (成品盘点)
+ var countJobs_ByErpItemCode = await _countJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(CountJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(CountJobDTO.JobStatus),jsonStatus,"In"),
+ new(nameof(CountJobDTO.InventoryMode),EnumInventoryMode.ByErpItemCode.ToString())
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.CountJob_ByPackingCode, Count = countJobs_ByErpItemCode });
+ //发货
var deliverJobs = await _deliverJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
@@ -111,7 +147,7 @@ public class JobController : AbpController
}
}).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.DeliverJob, Count = deliverJobs });
-
+ //检验
var inspectJobs = await _inspectJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
@@ -124,7 +160,7 @@ public class JobController : AbpController
}
}).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.InspectJob, Count = inspectJobs });
-
+ //发料
var issueJobs = await _issueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
@@ -137,7 +173,7 @@ public class JobController : AbpController
}
}).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.IssueJob, Count = issueJobs });
-
+ //完工收货
var productReceiveJobs = await _productReceiveJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
@@ -150,7 +186,7 @@ public class JobController : AbpController
}
}).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.ProductReceiveJob, Count = productReceiveJobs });
-
+ //采购收货
var purchaseReceiptJobRequest = new SfsJobRequestInputBase
{
Condition = new Condition
@@ -169,7 +205,7 @@ public class JobController : AbpController
}
var purchaseReceiptJobs = await _purchaseReceiptJobAppService.GetCountByFilterAsync(purchaseReceiptJobRequest).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.PurchaseReceiptJob, Count = purchaseReceiptJobs });
-
+ //采购退货
var purchaseReturnJobs = await _purchaseReturnJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
@@ -182,7 +218,7 @@ public class JobController : AbpController
}
}).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.PurchaseReturnJob, Count = purchaseReturnJobs });
-
+ //上架
var putawayJobs = await _putawayJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
@@ -195,7 +231,7 @@ public class JobController : AbpController
}
}).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.PutawayJob, Count = putawayJobs });
-
+ //退料
var productionReturnJobs = await _productionReturnJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
{
Condition = new Condition
@@ -221,7 +257,97 @@ public class JobController : AbpController
}
}).ConfigureAwait(false);
list.Add(new JobCountDto { JobType = EnumJobType.ThirdLocationJob, Count = thirdLocationJobs });
-
+ //空器具库移
+ var containerTransferJob = await _containerJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.ContainerTransferJob, Count = containerTransferJob });
+ //注塑发料
+ var injectionIssueJob = await _injectionIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.InjectionIssueJob, Count = injectionIssueJob });
+ //注塑计划
+ var injectionPlanJob = await _injectionPlanJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.InjectionPlanJob, Count = injectionPlanJob });
+ //喷涂发料
+ var coatingIssueJob = await _coatingIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.CoatingIssueJob, Count = coatingIssueJob });
+ //装配发料
+ var assembleIssueJob = await _assembleIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.AssembleIssueJob, Count = assembleIssueJob });
+ //kitting发料
+ var kittingIssueJob = await _kittingIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.KittingIssueJob, Count = kittingIssueJob });
+ //备品发料
+ var sparePartIssueJob = await _sparePartIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+ {
+ Condition = new Condition
+ {
+ Filters = new List
+ {
+ new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+ new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+ }
+ }
+ }).ConfigureAwait(false);
+ list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
return new ListResultDto(list);
}
}
diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs
index c0569f598..5a45e7d5d 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
+using System.Xml.Linq;
namespace Win_in.Sfs.Shared.Domain.Shared;
@@ -216,8 +217,13 @@ public enum EnumTransSubType
ExcelInCountPlan = 6002,
///
- /// 立库出库
+ /// 立库出库线边仓调拨
///
- [Display(Name = "立库出库")]
- Depot_Out = 1510
+ [Display(Name = "立库出库线边仓调拨")]
+ Depot_Transfer_WIP = 1510,
+ ///
+ /// 立库出库线边仓领料
+ ///
+ [Display(Name = "立库出库线边仓领料")]
+ Depot_Issue_WIP = 1511
}
diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobType.cs
index 773cfa4ad..7989b1d7b 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobType.cs
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Job/EnumJobType.cs
@@ -58,11 +58,15 @@ public enum EnumJobType
CheckJob = 8,
///
- /// 盘点任务
+ /// 盘点任务有箱码
///
- [Display(Name = "盘点")]
- CountJob = 9,
-
+ [Display(Name = "盘点任务有箱码")]
+ CountJob_ByPackingCode = 9,
+ ///
+ /// 盘点任务无箱码
+ ///
+ [Display(Name = "盘点任务无箱码")]
+ CountJob_ByErpItemCode = 10,
///
/// JIS发货
///
@@ -96,7 +100,7 @@ public enum EnumJobType
///
/// 器具转移
///
- [Display(Name = "转移")]
+ [Display(Name = "器具转移")]
ContainerTransferJob = 16,
///
@@ -104,4 +108,39 @@ public enum EnumJobType
///
[Display(Name = "三方库")]
ThirdLocationJob = 17,
+ ///
+ /// 注塑发料
+ ///
+ [Display(Name = "注塑发料")]
+ InjectionIssueJob = 18,
+ ///
+ /// 注塑计划
+ ///
+ [Display(Name = "注塑计划")]
+ InjectionPlanJob = 19,
+ ///
+ /// 喷涂发料
+ ///
+ [Display(Name = "喷涂发料")]
+ CoatingIssueJob = 20,
+ ///
+ /// 装配发料
+ ///
+ [Display(Name = "装配发料")]
+ AssembleIssueJob = 21,
+ ///
+ /// kitting发料
+ ///
+ [Display(Name = "kitting发料")]
+ KittingIssueJob = 22,
+ ///
+ /// 备品发料
+ ///
+ [Display(Name = "备品发料")]
+ SparePartIssueJob = 23,
+ ///
+ /// 盘点任务
+ ///
+ [Display(Name = "盘点任务")]
+ CountJob = 24,
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs
index 2cd636b5c..35f80e4ca 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs
@@ -186,7 +186,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
transferNoteEditInput.Remark = String.Empty;
transferNoteEditInput.Worker = _currentUser.UserName;
transferNoteEditInput.ActiveDate = CommonHelper.CurTime;
- transferNoteEditInput.Type = EnumTransSubType.Depot_Out.ToString(); //喷涂完工转储
+ //transferNoteEditInput.Type = EnumTransSubType.Depot_Out.ToString(); //喷涂完工转储
transferNoteEditInput.UseOnTheWayLocation = false;
//transferNoteEditInput.number
//transferNoteEditInput.CallServerName
@@ -244,6 +244,19 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
detailObj.ToStatus = EnumInventoryStatus.OK;
detailObj.OnTheWayLocationCode = String.Empty;
detailObj.Reason = "";
+
+ //from 库位类型半成品、成品 to 库位类型为线边仓，transferNoteEditInput.Type 赋值Depot_Issue_WIP
+ if ((fromLocationObj.Type == EnumLocationType.SEMI || fromLocationObj.Type == EnumLocationType.FG)
+ && (toLocationObj.Type == EnumLocationType.WIP || toLocationObj.Type == EnumLocationType.KittingWip))
+ {
+ transferNoteEditInput.Type = EnumTransSubType.Depot_Issue_WIP.ToString();
+ }
+ else
+ {
+ //from 库位类型为线边仓 to 库位类型为线边仓，transferNoteEditInput.Type 赋值Depot_Transfer_WIP
+ //其它条件
+ transferNoteEditInput.Type = EnumTransSubType.Depot_Transfer_WIP.ToString();
+ }
var temp = await _transferNoteAppService.CreateAsync(transferNoteEditInput).ConfigureAwait(false);
ret.Code = GaoTongResultStatus.Success;
ret.Message = "接收成功";
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
index e4628b64c..4c24c6ed6 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@@ -109,7 +109,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
$"或{EnumLocationType.SEMI.GetDisplayName()}" +
$"或{EnumLocationType.FG.GetDisplayName()}】");
}
- unplannedIssueRequest.DirectCreateNote = false;
+ // unplannedIssueRequest.DirectCreateNote = false;
input.IsPackingCode = true;//只查询带箱码的推荐
}
if (unplannedIssueRequest.UnplannedIssueType == EnumUnplannedIssueType.Wip)
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
index 847368731..8f1bac0d2 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
@@ -60,7 +60,6 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
{
await SetDetailPropertiesAsync(item).ConfigureAwait(false);
}
-
entity.AutoCompleteJob = false; //任务到记录
entity.AutoSubmit = true;
entity.AutoAgree = true;
@@ -111,7 +110,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
$"或{EnumLocationType.SEMI.GetDisplayName()}】" +
$"或{EnumLocationType.FG.GetDisplayName()}】");
}
- unplannedReceiptRequest.DirectCreateNote = false;
+ // unplannedReceiptRequest.DirectCreateNote = false;
//需要复制一个这个方法 去掉区域参数 换成库位参数
//RecommendBalanceRequestInput input = new RecommendBalanceRequestInput();
//input.ItemCode = detail.ItemCode;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountExtension.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountExtension.cs
index 086f91a2e..e75bde263 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountExtension.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/CountJobs/CountExtension.cs
@@ -19,7 +19,19 @@ public static class CountExtension
public static CountJob Init(this CountJob job)
{
job.JobStatus = EnumJobStatus.Open;
- job.JobType = EnumJobType.CountJob;
+ if (job.InventoryMode == EnumInventoryMode.ByPackingCode)
+ {
+ job.JobType = EnumJobType.CountJob_ByPackingCode;
+ }
+ else if (job.InventoryMode == EnumInventoryMode.ByErpItemCode)
+ {
+ job.JobType = EnumJobType.CountJob_ByErpItemCode;
+ }
+ else
+ {
+ job.JobType = EnumJobType.CountJob;
+ }
+
return job;
}