PackageApplysApplicationService.cs 46 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994
  1. using System;
  2. using System.Collections.Generic;
  3. using System.Data.Entity;
  4. using System.Linq;
  5. using System.Text.RegularExpressions;
  6. using System.Threading.Tasks;
  7. using System.Web.Mvc;
  8. using Abp.Application.Services.Dto;
  9. using Abp.Auditing;
  10. using Abp.Authorization;
  11. using Abp.Domain.Repositories;
  12. using Abp.Extensions;
  13. using Abp.Runtime.Caching;
  14. using Abp.Timing;
  15. using IwbZero.Auditing;
  16. using IwbZero.AppServiceBase;
  17. using IwbZero.Helper;
  18. using IwbZero.IdentityFramework;
  19. using IwbZero.Setting;
  20. using ShwasherSys.Authorization.Permissions;
  21. using ShwasherSys.BaseSysInfo;
  22. using ShwasherSys.Common;
  23. using ShwasherSys.CompanyInfo;
  24. using ShwasherSys.FinshedStoreInfo.Dto;
  25. using ShwasherSys.Lambda;
  26. using ShwasherSys.PackageInfo.Dto;
  27. using ShwasherSys.ProductInfo;
  28. using ShwasherSys.ProductStoreInfo;
  29. using ShwasherSys.SemiProductStoreInfo;
  30. using LambdaExpType = ShwasherSys.Lambda.LambdaExpType;
  31. using LambdaFieldType = ShwasherSys.Lambda.LambdaFieldType;
  32. using LambdaObject = ShwasherSys.Lambda.LambdaObject;
  33. namespace ShwasherSys.PackageInfo
  34. {
  35. [AbpAuthorize, AuditLog("产品包装信息")]
  36. public class PackInfoApplyAppService : ShwasherAsyncCrudAppService<PackageApply, PackageApplyDto, int, PagedRequestDto, PackageApplyCreateDto, PackageApplyUpdateDto >
  37. , IPackInfoApplyAppService
  38. {
  39. public PackInfoApplyAppService(
  40. IRepository<CurrentProductStoreHouse> finshedCurrentStoreRepository,
  41. IRepository<FinshedEnterStore> finshedEnterStoreRepository,
  42. IRepository<SemiEnterStore> semiEnterStoreRepository,
  43. IRepository<SemiOutStore> semiOutStoreRepository,
  44. IRepository<CurrentSemiStoreHouse> currentSemiStoreHouseRepository,
  45. IRepository<BusinessLog> logRepository,
  46. IRepository<Product, string> productRepository,
  47. IIwbSettingManager settingManager,
  48. ICacheManager cacheManager,
  49. IRepository<PackageApply, int> repository, IRepository<SemiProducts, string> semiProductsRepository, IRepository<ViewPackageApply> viewPackageApplyRepository, IRepository<EmployeeWorkPerformance> performanceRepository, ICommonAppService commonAppService, IRepository<ViewProductEnterStore> viewProductEnterStoreRepository) : base(repository, "PackageApplyNo")
  50. {
  51. SettingManager = settingManager;
  52. CacheManager = cacheManager;
  53. FinshedCurrentStoreRepository = finshedCurrentStoreRepository;
  54. FinshedEnterStoreRepository = finshedEnterStoreRepository;
  55. SemiEnterStoreRepository = semiEnterStoreRepository;
  56. SemiOutStoreRepository = semiOutStoreRepository;
  57. CurrentSemiStoreHouseRepository = currentSemiStoreHouseRepository;
  58. LogRepository = logRepository;
  59. ProductRepository = productRepository;
  60. SemiProductsRepository = semiProductsRepository;
  61. ViewPackageApplyRepository = viewPackageApplyRepository;
  62. PerformanceRepository = performanceRepository;
  63. CommonAppService = commonAppService;
  64. ViewProductEnterStoreRepository = viewProductEnterStoreRepository;
  65. }
  66. protected override bool KeyIsAuto { get; set; } = true;
  67. public IRepository<EmployeeWorkPerformance> PerformanceRepository { get; }
  68. public IRepository<CurrentProductStoreHouse> FinshedCurrentStoreRepository { get; }
  69. public IRepository<FinshedEnterStore> FinshedEnterStoreRepository { get; }
  70. public IRepository<ViewProductEnterStore> ViewProductEnterStoreRepository { get; }
  71. public IRepository<SemiEnterStore> SemiEnterStoreRepository { get; }
  72. public IRepository<SemiOutStore> SemiOutStoreRepository { get; }
  73. public IRepository<CurrentSemiStoreHouse> CurrentSemiStoreHouseRepository { get; }
  74. public IRepository<BusinessLog> LogRepository { get; }
  75. public IRepository<Product, string> ProductRepository { get; }
  76. public IRepository<SemiProducts, string> SemiProductsRepository { get; }
  77. public IRepository<ViewPackageApply> ViewPackageApplyRepository { get; }
  78. public ICommonAppService CommonAppService { get; }
  79. #region GetSelect
  80. [DisableAuditing]
  81. public async Task<List<SelectListItem>> GetSelectList()
  82. {
  83. var list = await Repository.GetAllListAsync();
  84. var slist = new List<SelectListItem> {new SelectListItem {Text = @"请选择...", Value = "", Selected = true}};
  85. foreach (var l in list)
  86. {
  87. slist.Add(new SelectListItem { Text = l.ProductionOrderNo, Value = l.ProductionOrderNo });
  88. }
  89. return slist;
  90. }
  91. [DisableAuditing]
  92. public async Task<string> GetSelectStr()
  93. {
  94. var list = await Repository.GetAllListAsync();
  95. string str = "<option value=\"\" selected>请选择...</option>";
  96. foreach (var l in list)
  97. {
  98. str += $"<option value=\"{l.ProductionOrderNo}\">{l.ProductionOrderNo}</option>";
  99. }
  100. return str;
  101. }
  102. #endregion
  103. #region CURD
  104. #region Get
  105. [DisableAuditing]
  106. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgQuery)]
  107. public Task<PackageApply> GetEntityById(int id)
  108. {
  109. return Repository.GetAsync(id);
  110. }
  111. [DisableAuditing]
  112. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgQuery)]
  113. public Task<PackageApply> GetEntityByNo(string no)
  114. {
  115. if (KeyFiledName.IsNullOrEmpty())
  116. {
  117. CheckErrors(IwbIdentityResult.Failed("编码/编号字段不明确,请检查后再操作!"));
  118. }
  119. LambdaObject obj = new LambdaObject()
  120. {
  121. FieldType = LambdaFieldType.S,
  122. FieldName = KeyFiledName,
  123. FieldValue = no,
  124. ExpType = LambdaExpType.Equal
  125. };
  126. var exp = obj.GetExp<PackageApply>();
  127. return Repository.FirstOrDefaultAsync(exp);
  128. }
  129. [DisableAuditing]
  130. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgQuery)]
  131. public async Task<PackageApplyDto> GetDtoById(int id)
  132. {
  133. var entity = await GetEntityById(id);
  134. return MapToEntityDto(entity);
  135. }
  136. [DisableAuditing]
  137. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgQuery)]
  138. public async Task<PackageApplyDto> GetDtoByNo(string no)
  139. {
  140. var entity = await GetEntityByNo(no);
  141. return MapToEntityDto(entity);
  142. }
  143. #endregion
  144. [DisableAuditing]
  145. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgQuery)]
  146. public override async Task<PagedResultDto<PackageApplyDto>> GetAll(PagedRequestDto input)
  147. {
  148. var query = ViewPackageApplyRepository.GetAll();
  149. var packType = "";
  150. var querySemiProduct = SemiProductsRepository.GetAll();
  151. var queryFinshedProduct = ProductRepository.GetAll();
  152. if (input.SearchList != null && input.SearchList.Count > 0)
  153. {
  154. foreach (var o in input.SearchList)
  155. {
  156. if (o.KeyWords.IsNullOrEmpty())
  157. continue;
  158. if (o.KeyField != "PackType") continue;
  159. packType = o.KeyWords;
  160. continue;
  161. }
  162. }
  163. IQueryable<PackageApplyDto> queryEntity=null;
  164. if (packType == "1")
  165. {
  166. queryEntity = from ispec in query
  167. join sp in querySemiProduct on ispec.SemiProductNo equals sp.Id into isp
  168. from unall in isp.DefaultIfEmpty()
  169. select new PackageApplyDto
  170. {
  171. ActualQuantity = ispec.ActualQuantity,
  172. ApplyStatus = ispec.ApplyStatus,
  173. ApplyQuantity = ispec.ApplyQuantity,
  174. CreatorUserId = ispec.CreatorUserId,
  175. ApplyDate = ispec.ApplyDate,
  176. TimeCreated = ispec.TimeCreated,
  177. PackType=1,
  178. CurrentSemiStoreHouseNo = ispec.CurrentSemiStoreHouseNo,
  179. Id = ispec.Id,
  180. IsClose = ispec.IsClose,
  181. ProductName = unall.SemiProductName??"",
  182. Material = unall.Material ?? "",
  183. Model = unall.Model ?? "",
  184. Rigidity = unall.Rigidity ?? "",
  185. SurfaceColor = unall.SurfaceColor ?? "",
  186. PartNo = unall.PartNo ?? "",
  187. TimeLastMod = ispec.TimeLastMod,
  188. UserIDLastMod = ispec.UserIDLastMod,
  189. PackageApplyNo = ispec.PackageApplyNo,
  190. ProductionOrderNo = ispec.ProductionOrderNo,
  191. Remark = ispec.Remark,
  192. SemiProductNo = ispec.SemiProductNo,
  193. ProcessingNum = ispec.ProcessingNum,
  194. RemainApplyQuantity = (ispec.ApplyQuantity - (ispec.IsApplyEnterQuantity ?? 0)),
  195. IsApplyEnterQuantity = ispec.IsApplyEnterQuantity,
  196. KgWeight = ispec.KgWeight??0
  197. };
  198. }
  199. else
  200. {
  201. queryEntity = from ispec in query
  202. join sp in queryFinshedProduct on ispec.ProductNo equals sp.Id into isp
  203. from unall in isp.DefaultIfEmpty()
  204. select new PackageApplyDto
  205. {
  206. ActualQuantity = ispec.ActualQuantity,
  207. ApplyStatus = ispec.ApplyStatus,
  208. ApplyQuantity = ispec.ApplyQuantity,
  209. CreatorUserId = ispec.CreatorUserId,
  210. ApplyDate = ispec.ApplyDate,
  211. TimeCreated = ispec.TimeCreated,
  212. PackType=2,
  213. CurrentSemiStoreHouseNo = ispec.CurrentSemiStoreHouseNo,
  214. Id = ispec.Id,
  215. IsClose = ispec.IsClose,
  216. ProductName = unall.ProductName ?? "",
  217. Material = unall.Material ?? "",
  218. Model = unall.Model ?? "",
  219. Rigidity = unall.Rigidity ?? "",
  220. SurfaceColor = unall.SurfaceColor ?? "",
  221. PartNo = unall.PartNo ?? "",
  222. TimeLastMod = ispec.TimeLastMod,
  223. UserIDLastMod = ispec.UserIDLastMod,
  224. PackageApplyNo = ispec.PackageApplyNo,
  225. ProductionOrderNo = ispec.ProductionOrderNo,
  226. Remark = ispec.Remark,
  227. ProcessingNum = ispec.ProcessingNum,
  228. ProductNo = ispec.ProductNo,
  229. RemainApplyQuantity = (ispec.ApplyQuantity- (ispec.IsApplyEnterQuantity2??0)),
  230. IsApplyEnterQuantity = ispec.IsApplyEnterQuantity2,
  231. KgWeight = ispec.KgWeight??0
  232. };
  233. }
  234. if (input.SearchList != null && input.SearchList.Count > 0)
  235. {
  236. List<LambdaObject> objList = new List<LambdaObject>();
  237. foreach (var o in input.SearchList)
  238. {
  239. if (o.KeyWords.IsNullOrEmpty())
  240. continue;
  241. if (o.KeyField == "PackType")
  242. {
  243. packType = o.KeyWords;
  244. queryEntity = packType == "1"
  245. ? queryEntity.Where(a => !string.IsNullOrEmpty(a.SemiProductNo))
  246. : queryEntity.Where(a => !string.IsNullOrEmpty(a.ProductNo));
  247. continue;
  248. }
  249. object keyWords = o.KeyWords;
  250. //检查查询条件中带有规格且多个分割条件的
  251. ProductModelSearch.CheckModelGreaterOneFilter(o, ref keyWords);
  252. objList.Add(new LambdaObject
  253. {
  254. FieldType = (LambdaFieldType)o.FieldType,
  255. FieldName = o.KeyField,
  256. FieldValue = keyWords,
  257. ExpType = (LambdaExpType)o.ExpType
  258. });
  259. }
  260. if (objList.Any())
  261. {
  262. var exp = objList.GetExp<PackageApplyDto>();
  263. queryEntity = queryEntity.Where(exp);
  264. }
  265. }
  266. var totalCount = await AsyncQueryableExecuter.CountAsync(queryEntity);
  267. queryEntity = queryEntity.OrderByDescending(i => i.ProcessingNum).ThenByDescending(i=>i.TimeCreated);
  268. string pattern = ProductModelSearch.GetModelGreaterOneReg(input.SearchList);
  269. List<PackageApplyDto> entities;
  270. //检查查询条件中带有规格且多个分割条件的
  271. if (!pattern.IsNullOrEmpty())
  272. {
  273. var es = queryEntity.ToList();
  274. es = es.Where(f => f.Model != null && Regex.IsMatch(f.Model, pattern)).ToList();
  275. totalCount = es.Count;
  276. entities = es.Skip(input.SkipCount).Take(input.MaxResultCount).ToList();
  277. }
  278. else
  279. {
  280. queryEntity = queryEntity.Skip(input.SkipCount).Take(input.MaxResultCount);
  281. entities = await AsyncQueryableExecuter.ToListAsync(queryEntity);
  282. }
  283. //queryEntity = queryEntity.Skip(input.SkipCount).Take(input.MaxResultCount);
  284. //var entities = await AsyncQueryableExecuter.ToListAsync(queryEntity);
  285. var dtos = new PagedResultDto<PackageApplyDto>(
  286. totalCount,
  287. entities
  288. );
  289. return dtos;
  290. }
  291. /// <summary>
  292. /// 确认包装申请,创建包装明细
  293. /// </summary>
  294. /// <param name="input"></param>
  295. /// <returns></returns>
  296. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgCreate), AuditLog("确认包装申请")]
  297. public async Task CreatePackInfo(CreatePackInfosDto input)
  298. {
  299. if (input.PackageInfos!=null && input.PackageInfos.Any())
  300. {
  301. //var entity = await Repository.FirstOrDefaultAsync(a => a.PackageApplyNo == input.PackageApplyNo);
  302. var entity = Repository.FirstOrDefault(i => i.PackageApplyNo == input.PackageApplyNo);
  303. if (entity==null)
  304. {
  305. CheckErrors(IwbIdentityResult.Failed("未发现包装申请!"));
  306. return;
  307. }
  308. ////半成品检验下是否存在同批次的其它产品入库,成品改包装暂时取消校验
  309. //if (input.PackType == 1)
  310. //{
  311. // var preExistEnter = await GetProductionOrderHasCreate(input.ProductionOrderNo);
  312. // if (preExistEnter != null && preExistEnter.ProductNo != input.ProductNo)
  313. // {
  314. // CheckErrors(IwbIdentityResult.Failed("此流转单号已有其它产品入库!"));
  315. // return;
  316. // }
  317. //}
  318. entity.ApplyStatus = PackageApplyStatusEnum.Audited.ToInt() + "";
  319. await Repository.UpdateAsync(entity);
  320. var date = Clock.Now;
  321. foreach (var info in input.PackageInfos)
  322. {
  323. var f = new FinshedEnterStore()
  324. {
  325. PackageApplyNo = input.PackageApplyNo,
  326. ProductionOrderNo = input.ProductionOrderNo,
  327. PackageProductNo = input.PackageProductNo,
  328. ProductNo= input.ProductNo,
  329. SourceStoreHouseId = entity.SourceStore,
  330. StoreHouseId = 1,
  331. ApplyQuantity = info.ActualQuantity,
  332. ApplyQuantity2 = info.ActualQuantity2,
  333. PackageCount = info.PackageCount,
  334. PackageSpecification = info.PackageSpecification,
  335. Quantity = info.PackageCount * info.PackageSpecification,
  336. PackageEnterNum = info.PackageEnterNum,
  337. ActualPackageCount = 0,
  338. ApplyStatus = FinshedEnterStoreApplyStatusEnum.New.ToInt(),
  339. ApplySourceType= input.PackType,
  340. IsClose = false,
  341. ApplyEnterDate = date,
  342. KgWeight = info.KgWeight,
  343. VerifyUser = info.VerifyUser,
  344. PackageUser = info.PackageUser,
  345. TimeLastMod = date,
  346. TimeCreated = date,
  347. CreatorUserId = AbpSession.UserName,
  348. UserIDLastMod = AbpSession.UserName,
  349. Remark = input.Remark
  350. };
  351. var id= await FinshedEnterStoreRepository.InsertAndGetIdAsync(f);
  352. await CreatePerformance(info, entity.ProductionOrderNo,id);
  353. await CreatePerformance(info, entity.ProductionOrderNo,id,false);
  354. }
  355. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  356. $"确认包装,分配包装规格信息为:[{input.Obj2String()}]",
  357. entity.ProductionOrderNo,entity.PackageApplyNo);
  358. }
  359. else
  360. {
  361. CheckErrors(IwbIdentityResult.Failed("未发现包装信息!"));
  362. }
  363. }
  364. private async Task CreatePerformance(PackInfoDto info,string productOrderNo,int id,bool isVerify=true)
  365. {
  366. var p = new EmployeeWorkPerformance()
  367. {
  368. PerformanceNo =await WorkTypeDefinition.GetPerformanceNo(PerformanceRepository,isVerify?WorkTypeDefinition.VerifyPackage : WorkTypeDefinition.Package),
  369. ProductOrderNo = productOrderNo,
  370. EmployeeId =isVerify? info.VerifyUserId:info.PackageUserId,
  371. WorkType = isVerify ? WorkTypeDefinition.VerifyPackage : WorkTypeDefinition.Package,
  372. RelatedNo = id+"",
  373. Performance = info.ActualQuantity2,
  374. PerformanceUnit = "千件",
  375. PerformanceDesc =
  376. $"{(isVerify ? $"{info.VerifyUser}核件" : $"{info.PackageUser}负责包装")}{info.ActualQuantity2}千件,总重:{info.ActualQuantity}kg,千件重:{info.KgWeight}",
  377. };
  378. await PerformanceRepository.InsertAsync(p);
  379. await CurrentUnitOfWork.SaveChangesAsync();
  380. }
  381. /// <summary>
  382. /// 拒绝包装申请
  383. /// </summary>
  384. /// <param name="input"></param>
  385. /// <returns></returns>
  386. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgRefuse), AuditLog("拒绝包装申请")]
  387. public async Task RefusePackInfoApply(RefusePackInfoDto input)
  388. {
  389. var entity = await Repository.FirstOrDefaultAsync(a => a.Id == input.Id);
  390. if (entity.ApplyStatus != PackageApplyStatusEnum.Applying.ToInt()+"")
  391. {
  392. CheckErrors(IwbIdentityResult.Failed("申请已被审核(或拒绝),不能再操作!"));
  393. }
  394. var date = Clock.Now;
  395. if (input.PackType==1)
  396. {
  397. SemiEnterStore semiEnterStore = new SemiEnterStore
  398. {
  399. ApplyEnterDate = Clock.Now,
  400. ApplySource = EnterStoreApplySourceEnum.RefusePackage.ToInt().ToString(),
  401. ApplyStatus = EnterStoreApplyStatusEnum.EnterStored.ToInt().ToString(),
  402. ProductionOrderNo = entity.ProductionOrderNo,
  403. SemiProductNo = entity.SemiProductNo,
  404. Quantity = entity.ApplyQuantity,
  405. ActualQuantity = entity.ApplyQuantity,
  406. EnterStoreDate = date,
  407. AuditDate = date,
  408. EnterStoreUser = AbpSession.UserName,
  409. AuditUser = AbpSession.UserName,
  410. TimeCreated = date,
  411. CreatorUserId = AbpSession.UserName,
  412. TimeLastMod = date,
  413. UserIDLastMod = AbpSession.UserName,
  414. IsClose = true,
  415. Remark = "申请包装被拒绝",
  416. StoreHouseId = entity.SourceStore,
  417. };
  418. var currentStore = await
  419. CurrentSemiStoreHouseRepository.FirstOrDefaultAsync(i =>
  420. i.CurrentSemiStoreHouseNo == entity.CurrentSemiStoreHouseNo);
  421. if (currentStore == null)
  422. {
  423. CheckErrors(IwbIdentityResult.Failed("未发现库存!"));
  424. return;
  425. }
  426. currentStore.ActualQuantity += entity.ApplyQuantity;
  427. await CurrentSemiStoreHouseRepository.UpdateAsync(currentStore);
  428. semiEnterStore.KgWeight = currentStore.KgWeight;
  429. await SemiEnterStoreRepository.InsertAsync(semiEnterStore);
  430. }
  431. else if(input.PackType == 2)
  432. {
  433. FinshedEnterStore finshedEnterStore = new FinshedEnterStore
  434. {
  435. PackageApplyNo = entity.PackageApplyNo,
  436. ProductionOrderNo = entity.ProductionOrderNo,
  437. PackageProductNo = entity.ProductNo,
  438. ProductNo = entity.ProductNo,
  439. StoreHouseId = entity.SourceStore,
  440. Quantity = entity.ApplyQuantity,
  441. PackageCount = 1,
  442. PackageSpecification = entity.ApplyQuantity,
  443. ActualPackageCount = 1,
  444. ApplyStatus = FinshedEnterStoreApplyStatusEnum.EnterStored.ToInt(),
  445. ApplySourceType = entity.SourceStore,
  446. IsClose = true,
  447. ApplyEnterDate = date,
  448. EnterStoreDate = date,
  449. AuditDate = date,
  450. EnterStoreUser = AbpSession.UserName,
  451. AuditUser = AbpSession.UserName,
  452. TimeLastMod = date,
  453. TimeCreated = date,
  454. Remark = "申请包装被拒绝",
  455. CreatorUserId = AbpSession.UserName,
  456. UserIDLastMod = AbpSession.UserName,
  457. };
  458. var currentStore = await
  459. FinshedCurrentStoreRepository.FirstOrDefaultAsync(i =>
  460. i.CurrentProductStoreHouseNo == entity.CurrentSemiStoreHouseNo);
  461. if (currentStore == null)
  462. {
  463. CheckErrors(IwbIdentityResult.Failed("未发现库存!"));
  464. return;
  465. }
  466. currentStore.Quantity += entity.ApplyQuantity;
  467. await FinshedCurrentStoreRepository.UpdateAsync(currentStore);
  468. finshedEnterStore.StoreLocationNo = currentStore.StoreLocationNo;
  469. await FinshedEnterStoreRepository.InsertAsync(finshedEnterStore);
  470. }
  471. entity.ApplyStatus = PackageApplyStatusEnum.Refused.ToInt() + "";
  472. await Repository.UpdateAsync(entity);
  473. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  474. "拒绝半成品包装申请",
  475. entity.ProductionOrderNo, entity.PackageApplyNo);
  476. }
  477. /// <summary>
  478. /// 关闭包装申请
  479. /// </summary>
  480. /// <param name="input"></param>
  481. /// <returns></returns>
  482. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgClose), AuditLog("关闭包装申请")]
  483. public async Task ClosePackInfoApply(EntityDto<int> input)
  484. {
  485. var entity = await Repository.FirstOrDefaultAsync(a => a.Id == input.Id);
  486. if (entity.ApplyStatus == PackageApplyStatusEnum.Applying.ToInt() + "")
  487. {
  488. CheckErrors(IwbIdentityResult.Failed("申请还未被审核(或拒绝),不能操作!"));
  489. }
  490. int newStatusEnum = FinshedEnterStoreApplyStatusEnum.New.ToInt();
  491. int enteredStatusEnum = FinshedEnterStoreApplyStatusEnum.EnterStored.ToInt();
  492. var item = await FinshedEnterStoreRepository.FirstOrDefaultAsync(i =>
  493. i.PackageApplyNo == entity.PackageApplyNo &&
  494. (i.ApplyStatus != newStatusEnum && i.ApplyStatus != enteredStatusEnum)&&!i.IsClose);
  495. if (item != null)
  496. {
  497. CheckErrors(IwbIdentityResult.Failed("有未完成的入库申请,不能操作!"));
  498. return;
  499. }
  500. entity.IsClose = true;
  501. await Repository.UpdateAsync(entity);
  502. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  503. "关闭半成品包装申请",
  504. entity.ProductionOrderNo, entity.PackageApplyNo);
  505. }
  506. //根据批次号获取非取消和拒绝状态的入库记录
  507. public async Task<FinshedEnterStore> GetHasExistProductionOrderNo(string pcProductionOrderNo)
  508. {
  509. int refusedStatus = FinshedEnterStoreApplyStatusEnum.Refused.ToInt();
  510. int canceledStatus = FinshedEnterStoreApplyStatusEnum.Canceled.ToInt();
  511. var entity = await FinshedEnterStoreRepository.GetAll().Where(a => a.ProductionOrderNo == pcProductionOrderNo && (a.ApplyStatus != refusedStatus && a.ApplyStatus != canceledStatus)).OrderByDescending(i => i.ApplyEnterDate).FirstOrDefaultAsync();
  512. return entity;
  513. }
  514. //根据批次号获取非取消和拒绝状态的入库记录
  515. public async Task<ViewProductEnterStore> GetHasExistProductionOrderNoView(string pcProductionOrderNo)
  516. {
  517. int refusedStatus = FinshedEnterStoreApplyStatusEnum.Refused.ToInt();
  518. int canceledStatus = FinshedEnterStoreApplyStatusEnum.Canceled.ToInt();
  519. var entity = await ViewProductEnterStoreRepository.GetAll().Where(a => a.ProductionOrderNo == pcProductionOrderNo && (a.ApplyStatus != refusedStatus && a.ApplyStatus != canceledStatus)).OrderByDescending(i=>i.ApplyEnterDate).FirstOrDefaultAsync();
  520. return entity;
  521. }
  522. /// <summary>
  523. /// 检测申请入库批次号中的产品是否与之前申请的一致
  524. /// </summary>
  525. /// <param name="pcProductionOrderNo"></param>
  526. /// <param name="pcProductNo"></param>
  527. /// <returns>true:是与之前申请的一致 false:不一致或者没有入库记录</returns>
  528. private async Task<bool> CheckProductionOrderHasCreate(string pcProductionOrderNo,string pcProductNo)
  529. {
  530. var entity =await GetProductionOrderHasCreate(pcProductionOrderNo);
  531. //var b = entity?.ProductNo == pcProductNo;
  532. if (entity != null)
  533. {
  534. return entity.ProductNo == pcProductNo;
  535. }
  536. return false;
  537. }
  538. /// <summary>
  539. /// 检测申请入库批次号中的产品是否与之前申请的一致
  540. /// </summary>
  541. /// <param name="pcProductionOrderNo"></param>
  542. /// <returns>true:是与之前申请的一致 false:不一致或者没有入库记录</returns>
  543. private async Task<FinshedEnterStore> GetProductionOrderHasCreate(string pcProductionOrderNo)
  544. {
  545. var entity = await GetHasExistProductionOrderNo(pcProductionOrderNo);
  546. return entity;
  547. }
  548. //protected override IQueryable<PackageApply> ApplySorting(IQueryable<PackageApply> query, PagedRequestDto input)
  549. //{
  550. // return query.OrderBy(a => a.No);
  551. //}
  552. //protected override IQueryable<PackageApply> ApplyPaging(IQueryable<PackageApply> query, PagedRequestDto input)
  553. //{
  554. // if (input is IPagedResultRequest pagedInput)
  555. // {
  556. // return query.Skip(pagedInput.SkipCount).Take(pagedInput.MaxResultCount);
  557. // }
  558. // return query;
  559. //}
  560. #endregion
  561. #region 包装后成品入库
  562. /// <summary>
  563. /// 查询包装明细
  564. /// </summary>
  565. /// <param name="input"></param>
  566. /// <returns></returns>
  567. [DisableAuditing,AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgQuery)]
  568. public PagedResultDto<FinshedEnterStore> GetFinishedEnterStoreApply(PagedRequestDto input)
  569. {
  570. var query = FinshedEnterStoreRepository.GetAll();
  571. if (input.SearchList != null && input.SearchList.Count > 0)
  572. {
  573. List<LambdaObject> objList = new List<LambdaObject>();
  574. foreach (var o in input.SearchList)
  575. {
  576. if (o.KeyWords.IsNullOrEmpty())
  577. continue;
  578. object keyWords = o.KeyWords;
  579. objList.Add(new LambdaObject
  580. {
  581. FieldType = (LambdaFieldType)o.FieldType,
  582. FieldName = o.KeyField,
  583. FieldValue = keyWords,
  584. ExpType = (LambdaExpType)o.ExpType
  585. });
  586. }
  587. var exp = objList.GetExp<FinshedEnterStore>();
  588. query = query.Where(exp);
  589. }
  590. var totalCount = query.Count();
  591. query = query.OrderByDescending(i => i.TimeCreated);
  592. query = query.Skip(input.SkipCount).Take(input.MaxResultCount);
  593. var entities = query.ToList();
  594. var dtos = new PagedResultDto<FinshedEnterStore>(
  595. totalCount, entities
  596. );
  597. return dtos;
  598. }
  599. /// <summary>
  600. /// 修改包装明细
  601. /// </summary>
  602. /// <param name="input"></param>
  603. /// <returns></returns>
  604. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgUpdate), AuditLog("修改包装明细")]
  605. public async Task UpdatePackInfo(UpdatePackInfoDto input)
  606. {
  607. var entity = await FinshedEnterStoreRepository.FirstOrDefaultAsync(a => a.Id == input.Id);
  608. if (entity==null)
  609. {
  610. CheckErrors(IwbIdentityResult.Failed("未找到包装明细!"));
  611. return;
  612. }
  613. entity.TimeLastMod = Clock.Now;
  614. entity.UserIDLastMod = AbpSession.UserName;
  615. entity.ApplyQuantity = input.Quantity;
  616. entity.PackageSpecification = input.PackageSpecification;
  617. entity.PackageCount = input.PackageCount;
  618. entity.Quantity = input.PackageSpecification* input.PackageCount;
  619. entity.PackageEnterNum = input.PackageEnterNum;
  620. await FinshedEnterStoreRepository.UpdateAsync(entity);
  621. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  622. $"修改包装明细[{entity.Id}],信息为:[{entity.Obj2String()}]",
  623. entity.ProductionOrderNo, entity.PackageApplyNo);
  624. }
  625. /// <summary>
  626. /// 添加包装明细
  627. /// </summary>
  628. /// <param name="input"></param>
  629. /// <returns></returns>
  630. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgUpdate), AuditLog("添加包装明细")]
  631. public async Task AddPackInfo(CreatePackInfoDto input)
  632. {
  633. var entity2 = await Repository.FirstOrDefaultAsync(a => a.PackageApplyNo == input.PackageApplyNo);
  634. if (entity2.IsClose)
  635. {
  636. CheckErrors(IwbIdentityResult.Failed("申请已关闭,不能操作!"));
  637. }
  638. var date = Clock.Now;
  639. var f = new FinshedEnterStore()
  640. {
  641. PackageApplyNo = input.PackageApplyNo,
  642. ProductionOrderNo = input.ProductionOrderNo,
  643. PackageProductNo = input.PackageProductNo,
  644. ProductNo= input.ProductNo,
  645. SourceStoreHouseId = entity2.SourceStore,
  646. StoreHouseId = 1,
  647. ApplyQuantity = input.Quantity,
  648. ApplyQuantity2 = input.Quantity2,
  649. KgWeight = input.KgWeight,
  650. Quantity = input.PackageSpecification * input.PackageCount,
  651. PackageCount = input.PackageCount,
  652. PackageSpecification = input.PackageSpecification,
  653. ActualPackageCount = 0,
  654. ApplyStatus = FinshedEnterStoreApplyStatusEnum.New.ToInt(),
  655. ApplySourceType = input.PackType,
  656. IsClose = false,
  657. VerifyUser = input.VerifyUser,
  658. PackageUser = input.PackageUser,
  659. ApplyEnterDate = date,
  660. TimeLastMod = date,
  661. TimeCreated = date,
  662. CreatorUserId = AbpSession.UserName,
  663. UserIDLastMod = AbpSession.UserName,
  664. PackageEnterNum = input.PackageEnterNum,
  665. Remark = input.Remark
  666. };
  667. var entity= await FinshedEnterStoreRepository.InsertAsync(f);
  668. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  669. $"添加包装明细[{entity.Id}],信息为:[{input.Obj2String()}]",
  670. input.ProductionOrderNo, input.PackageApplyNo);
  671. }
  672. /// <summary>
  673. /// 删除包装明细
  674. /// </summary>
  675. /// <param name="input"></param>
  676. /// <returns></returns>
  677. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgDelete), AuditLog("删除包装明细")]
  678. public async Task DeletePackInfo(EntityDto input)
  679. {
  680. var entity = await FinshedEnterStoreRepository.FirstOrDefaultAsync(a => a.Id == input.Id);
  681. if (entity == null)
  682. {
  683. CheckErrors(IwbIdentityResult.Failed("未找到包装明细!"));
  684. return;
  685. }
  686. await FinshedEnterStoreRepository.DeleteAsync(entity);
  687. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  688. $"删除包装明细[{entity.Id}],信息为:[{entity.Obj2String()}]",
  689. entity.ProductionOrderNo, entity.PackageApplyNo);
  690. }
  691. /// <summary>
  692. /// 包装完成入库申请批量
  693. /// </summary>
  694. /// <param name="applyNo"></param>
  695. /// <returns></returns>
  696. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgEnter), AuditLog("包装完成发起成品入库申请(批量)")]
  697. public async Task CreateProductApplyBatch(string applyNo)
  698. {
  699. var entities = await FinshedEnterStoreRepository.GetAllListAsync(a => a.PackageApplyNo == applyNo);
  700. if (entities!=null && entities.Any())
  701. {
  702. foreach (var entity in entities)
  703. {
  704. if (entity.ApplyStatus == FinshedEnterStoreApplyStatusEnum.New.ToInt())
  705. {
  706. entity.ApplyStatus = FinshedEnterStoreApplyStatusEnum.Applying.ToInt();
  707. await FinshedEnterStoreRepository.UpdateAsync(entity);
  708. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "产品包装",
  709. $"包装完成发起成品入库申请(批量)[{entity.Id}]",
  710. entity.ProductionOrderNo, entity.PackageApplyNo,entity.ProductNo);
  711. }
  712. }
  713. }
  714. }
  715. /// <summary>
  716. /// 包装完成入库申请
  717. /// </summary>
  718. /// <param name="input"></param>
  719. /// <returns></returns>
  720. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgEnter), AuditLog("包装完成发起成品入库申请")]
  721. public async Task CreateProductApply(EntityDto input)
  722. {
  723. var entity = await FinshedEnterStoreRepository.FirstOrDefaultAsync(a => a.Id == input.Id);
  724. if (entity == null)
  725. {
  726. CheckErrors(IwbIdentityResult.Failed("未找到包装明细!"));
  727. return;
  728. }
  729. entity.ApplyStatus = FinshedEnterStoreApplyStatusEnum.Applying.ToInt();
  730. await FinshedEnterStoreRepository.UpdateAsync(entity);
  731. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  732. $"包装完成发起成品入库申请[{entity.Id}]",
  733. entity.ProductionOrderNo, entity.PackageApplyNo, entity.ProductNo);
  734. }
  735. /// <summary>
  736. /// 确认入库数量(by yue.)
  737. /// </summary>
  738. /// <param name="input"></param>
  739. /// <returns></returns>
  740. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgConfirm), AuditLog("确认包装成品入库数量")]
  741. public async Task ConfirmProductApply(EntityDto<int> input)
  742. {
  743. var entity = await FinshedEnterStoreRepository.FirstOrDefaultAsync(a => a.Id == input.Id);
  744. if (entity == null)
  745. {
  746. CheckErrors(IwbIdentityResult.Failed("未找到包装明细!"));
  747. return;
  748. }
  749. if (entity.ApplyStatus == FinshedEnterStoreApplyStatusEnum.EnterStored.ToInt())
  750. {
  751. CheckErrors(IwbIdentityResult.Failed("该记录已确认入库!"));
  752. return;
  753. }
  754. var date = Clock.Now;
  755. entity.EnterStoreDate = date;
  756. entity.EnterStoreUser = AbpSession.UserName;
  757. entity.ApplyStatus = FinshedEnterStoreApplyStatusEnum.EnterStored.ToInt();
  758. var currentStore =await FinshedCurrentStoreRepository.FirstOrDefaultAsync(a => a.ProductionOrderNo == entity.ProductionOrderNo&& a.StoreLocationNo==entity.StoreLocationNo && a.ProductNo == entity.ProductNo);
  759. if (currentStore != null)
  760. {
  761. var isCanUpdate =
  762. CommonAppService.CheckStoreRecordCanUpdate(currentStore.CurrentProductStoreHouseNo);
  763. if (!isCanUpdate)
  764. CheckErrors(IwbIdentityResult.Failed("该库存处于退货或者正在盘点状态,不可进行出入库更新!"));
  765. currentStore.Quantity += entity.ActualPackageCount * entity.PackageSpecification;
  766. currentStore.TimeLastMod = date;
  767. currentStore.UserIDLastMod = AbpSession.UserName;
  768. await FinshedCurrentStoreRepository.UpdateAsync(currentStore);
  769. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  770. $"确认成品入库数量U[{entity.Id}-{currentStore.Quantity}-{entity.ActualPackageCount}-{entity.PackageSpecification}]",
  771. entity.ProductionOrderNo, currentStore.CurrentProductStoreHouseNo, entity.ProductNo, entity.StoreLocationNo);
  772. }
  773. else
  774. {
  775. string lcJson = entity.Obj2String();
  776. currentStore = lcJson.GetModel<CurrentProductStoreHouse>();
  777. currentStore.CurrentProductStoreHouseNo = Guid.NewGuid().ToString("N");
  778. currentStore.TimeCreated = date;
  779. currentStore.UserIDLastMod = AbpSession.UserName;
  780. currentStore.Quantity = entity.ActualPackageCount * entity.PackageSpecification;
  781. currentStore.FreezeQuantity = 0;
  782. await FinshedCurrentStoreRepository.InsertAsync(currentStore);
  783. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  784. $"确认成品入库数量ADD[{entity.Id}-{currentStore.Quantity}-{entity.ActualPackageCount}-{entity.PackageSpecification}]",
  785. entity.ProductionOrderNo, currentStore.CurrentProductStoreHouseNo, entity.ProductNo, entity.StoreLocationNo);
  786. }
  787. await FinshedEnterStoreRepository.UpdateAsync(entity);
  788. // BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  789. // $"确认成品入库数量[{entity.Id}]",
  790. // entity.ProductionOrderNo, currentStore.CurrentProductStoreHouseNo, entity.ProductNo,entity.StoreLocationNo);
  791. }
  792. /// <summary>
  793. /// 取消入库申请(by yue.)
  794. /// </summary>
  795. /// <param name="input"></param>
  796. /// <returns></returns>
  797. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgCancel), AuditLog("取消包装成品入库申请")]
  798. public async Task CancelProductApply(EntityDto<int> input)
  799. {
  800. var entity = await FinshedEnterStoreRepository.FirstOrDefaultAsync(a => a.Id == input.Id);
  801. if (entity == null)
  802. {
  803. CheckErrors(IwbIdentityResult.Failed("未找到包装明细!"));
  804. return;
  805. }
  806. entity.ApplyStatus = FinshedEnterStoreApplyStatusEnum.Canceled.ToInt();
  807. await FinshedEnterStoreRepository.UpdateAsync(entity);
  808. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  809. $"取消包装成品入库申请[{entity.Id}]",
  810. entity.ProductionOrderNo, entity.PackageApplyNo, entity.ProductNo);
  811. }
  812. /// <summary>
  813. /// 关闭入库申请 (by yue.)
  814. /// </summary>
  815. /// <param name="input"></param>
  816. /// <returns></returns>
  817. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgClose), AuditLog("关闭包装成品入库申请")]
  818. public async Task CloseProductApply(EntityDto<int> input)
  819. {
  820. var entity = await FinshedEnterStoreRepository.FirstOrDefaultAsync(a => a.Id == input.Id);
  821. if (entity == null)
  822. {
  823. CheckErrors(IwbIdentityResult.Failed("未找到包装明细!"));
  824. return;
  825. }
  826. entity.IsClose = true;
  827. await FinshedEnterStoreRepository.UpdateAsync(entity);
  828. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  829. $"关闭包装成品入库申请[{entity.Id}]",
  830. entity.ProductionOrderNo, entity.PackageApplyNo, entity.ProductNo);
  831. }
  832. /// <summary>
  833. /// 恢复入库申请(by yue.)
  834. /// </summary>
  835. /// <param name="input"></param>
  836. /// <returns></returns>
  837. [AbpAuthorize(PermissionNames.PagesPackInfoPackInfoMgPackageInfoMgRecovery), AuditLog("恢复包装成品入库申请")]
  838. public async Task RecoveryProductApply(EntityDto<int> input)
  839. {
  840. var entity = await FinshedEnterStoreRepository.FirstOrDefaultAsync(a => a.Id == input.Id);
  841. if (entity == null)
  842. {
  843. CheckErrors(IwbIdentityResult.Failed("未找到包装明细!"));
  844. return;
  845. }
  846. //var preEntity = await GetHasExistProductionOrderNo(entity.ProductionOrderNo);
  847. ////如果要恢复入库申请之前已经有这个批次其它产品绑定入库
  848. //if (preEntity.ProductNo!= entity.ProductNo)
  849. //{
  850. // CheckErrors(IwbIdentityResult.Failed("此流转单号已有其它产品入库!"));
  851. // return;
  852. //}
  853. entity.ApplyStatus = FinshedEnterStoreApplyStatusEnum.Applying.ToInt();
  854. await FinshedEnterStoreRepository.UpdateAsync(entity);
  855. BusinessLogTypeEnum.Package.WriteLog(LogRepository, "半成品包装",
  856. $"恢复包装成品入库申请[{entity.Id}]",
  857. entity.ProductionOrderNo, entity.PackageApplyNo, entity.ProductNo);
  858. }
  859. #endregion
  860. #region 包装日报统计
  861. public async Task<PackageDayDateDto> QueryPackageDaily(DateTime date)
  862. {
  863. var sd= new DateTime(date.Year,date.Month,date.Day);
  864. var ed = sd.AddDays(1);
  865. var status = new int[2]
  866. {
  867. FinshedEnterStoreApplyStatusEnum.New.ToInt(),
  868. FinshedEnterStoreApplyStatusEnum.Canceled.ToInt()
  869. };
  870. var query = FinshedEnterStoreRepository.GetAll().Where(a =>
  871. a.ApplyEnterDate >= sd && a.ApplyEnterDate < ed && !status.Contains(a.ApplyStatus)&&
  872. (a.ApplySourceType == 1 || a.ApplySourceType == 2)).OrderBy(a=>a.ApplyEnterDate).Join(
  873. ProductRepository.GetAll(), a => a.ProductNo, s => s.Id, (a, s) => new PackageDayDateItem()
  874. {
  875. PackageApplyNo = a.PackageApplyNo,
  876. ProductionOrderNo = a.ProductionOrderNo,
  877. ProductNo = a.ProductNo,
  878. ProductName = s.ProductName,
  879. PartNo = s.PartNo,
  880. Model = s.Model,
  881. Material = s.Material,
  882. SurfaceColor = s.SurfaceColor,
  883. Rigidity = s.Rigidity,
  884. KgQuantity = a.ApplyQuantity,
  885. PcsQuantity = a.ApplyQuantity2,
  886. KgWeight = a.KgWeight,
  887. PackageCount = a.PackageCount,
  888. PackageSpecification = a.PackageSpecification,
  889. PackageEnterNum = a.PackageEnterNum,
  890. PackageUser = a.PackageUser,
  891. VerifyUser = a.VerifyUser,
  892. ApplySourceType = a.ApplySourceType
  893. });
  894. var packageItems = await query.ToListAsync();
  895. var day = 26;
  896. var prevDate = date.Day < 26
  897. ? date.Month == 1
  898. ? new DateTime(date.Year - 1, 12, day)
  899. : new DateTime(date.Year, date.Month - 1, day)
  900. : new DateTime(date.Year, date.Month, day);
  901. var totalQuery = FinshedEnterStoreRepository.GetAll().Where(a =>
  902. a.ApplyEnterDate >= prevDate && a.ApplyEnterDate < ed && !status.Contains(a.ApplyStatus) &&
  903. (a.ApplySourceType == 1 || a.ApplySourceType == 2));
  904. int index =await totalQuery.CountAsync();
  905. decimal kgCount = 0, pcsCount = 0;
  906. if (index>0)
  907. {
  908. kgCount = await totalQuery.SumAsync(a => a.ApplyQuantity);
  909. pcsCount = await totalQuery.SumAsync(a => a.ApplyQuantity2);
  910. }
  911. PackageDayDateDto dto = new PackageDayDateDto(date,packageItems,index,kgCount,pcsCount);
  912. return dto;
  913. }
  914. #endregion
  915. }
  916. }