222

schangxiang@126.com

2025-09-24 68941a04cb2320daa22ba0d5ac79a4447c29998d

 iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs

@@ -239,6 +239,15 @@
               .Select(s => new WorkPieceProcessOutput
               {
                   Id = s.a.Id,

                   JiaJuGongWei = s.a.JiaJuGongWei,

                   DataCapturePointCname = s.a.DataCapturePointCname,
                   UpdateDataCapturePointCname = s.a.UpdateDataCapturePointCname,
                   QualityNoOkReason = s.a.QualityNoOkReason,
                   CreateUserName = s.a.CreatedUserName,
                   UpdatedUserName = s.a.UpdatedUserName,

                   WorkPieceID = s.a.WorkPieceID,
                   WorkingProcedureCurrent = s.a.WorkingProcedureCurrent,
                   EquipmentID = s.a.EquipmentID,
@@ -486,13 +495,13 @@
        public async Task<string> outBoundWorkPiece([FromBody] OutBoundInput input)
        {

            if (input.Password == null || !input.Password.Equals("123456"))
            {
                throw Oops.Oh("修改工件质量状态失败：密码输入错误！");
            }
            //if (input.Password == null || !input.Password.Equals("123456"))
            //{
            //    throw Oops.Oh("修改工件质量状态失败：密码输入错误！");
            //}
            if (input.WorkPieceInfoLst.Count < 1)
            {
                throw Oops.Oh("工件出库失败：数据不能为空！");
                throw Oops.Oh("工件入库失败：数据不能为空！");
            }

            List<OutBoundDetailsInput> WorkPieceInfoLst = input.WorkPieceInfoLst;
@@ -504,22 +513,31 @@

            List<WorkPieceInfo> db_WorkPieceInfoList = await _workPieceInfoRep.Where(w => queryOP80NewCodeList.Contains(w.OP80NewCode) && w.IsDeleted == false).ToListAsync();

            var addOutBoundLogList = new List<WorkPieceOutboundRecord>();

            foreach (var item in WorkPieceInfoLst)
            {
                var itemModel = db_itemModelList.FirstOrDefault(w => w.OP80NewCode == item.OP80NewCode);
                var itemModel = db_itemModelList.FirstOrDefault(w => w.OP80NewCode == item.OP80NewCode && w.IsDeleted == false);
                if (itemModel != null)
                {
                    //itemModel.IsDeleted = true;
                    //itemModel.Remark = itemModel.Remark ?? "" + "二次发货自动撤销发货";
                    //await _workPieceOutboundRep.UpdateAsync(itemModel);

                    /*
                    var createitme = itemModel.CreatedTime == null ? "" : (((DateTimeOffset)itemModel.CreatedTime).UtcDateTime.ToString("yyyy-MM-dd HH:mm:ss"));
                    throw Oops.Oh($"成品码{itemModel.OP80NewCode}已出库，出库时间:{createitme}");

                    //*/

                    //不再提示出来，自动忽略 【Editby shaocx,2024-09-04】
                    continue;
                }
                var workPiece = db_WorkPieceInfoList.FirstOrDefault(w => w.OP80NewCode == item.OP80NewCode);
                if (workPiece != null)
                {
                    workPiece.OutPerson = CurrentUserInfo.Name;
                    workPiece.OutRemark = "撤销工件出库";
                    workPiece.OutRemark = "撤销工件入库";
                    workPiece.OutTime = DateTime.Now;
                    workPiece.IsOut = false;

@@ -537,9 +555,28 @@
                };
                addOutBoundList.Add(outBoundLog);

                var outBoundLogRecord = new WorkPieceOutboundRecord
                {
                    OperationType = OutboundOperationType.入库.ToString(),
                    WorkPieceID = workPiece?.WorkPieceID,
                    OP80NewCode = item.OP80NewCode,

                    CreatedUserId = CurrentUserInfo.UserId,
                    CreatedUserName = CurrentUserInfo.Name,


                    //CarNo = input.CarNo,
                    Remark = "工件入库",

                };
                addOutBoundLogList.Add(outBoundLogRecord);


            }
            await _workPieceOutboundRep.InsertAsync(addOutBoundList);

            await _workPieceOutboundRecordRep.InsertAsync(addOutBoundLogList);

            return "出库成功";
        }