ALD自动小车搬运项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
heshaofeng
5 天以前 a2f948006c6c7e918ba4f2e66d477cc2d5017a75 
 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs


@@ -288,7 +288,7 @@


                                            {


                                                ReqCode = Guid.NewGuid().ToString(),


                                                ReqTime = DateTime.Now.ToString(),


                                                BusinessType = "2",


                                                BusinessType = "3",


                                                FactoryArea = inboundOrder.FactoryArea,


                                                OperationType = 1,


                                                Operator = inboundOrder.Operator,


@@ -379,6 +379,7 @@


                                                             .Where(it => it.OrderId == feedinboundOrder.Id).ExecuteCommand();


                                                    }


                                                }


                                                return WebResponseContent.Instance.Error("回传成功！");


                                            }


                                            else


                                            {


@@ -386,6 +387,7 @@


                                                .Where(it => it.Id == inboundOrder.Id).ExecuteCommand();


                                                _inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })


                                              .Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();


                                                return WebResponseContent.Instance.Error("回传异常！");


                                            }


                                        }


                                    }


@@ -675,13 +677,13 @@


            var mesResult = await FeedbackOutbound(feedModel);


            if (mesResult == null || mesResult.code != 200)


            {


                var messages = mesResult?.message??"";


                var messages = mesResult?.message ?? "";




                await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()


                   .SetColumns(x => new Dt_OutboundOrder


                   {


                       ReturnToMESStatus = 2,


                       Remark = messages, 


                       Remark = messages,


                   })


                   .Where(x => x.OrderNo == orderNo)


                   .ExecuteCommandAsync();


@@ -689,7 +691,7 @@


                await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()


                    .SetColumns(it => new Dt_OutboundOrderDetail


                    {


                        ReturnToMESStatus = 2,                       


                        ReturnToMESStatus = 2,


                        documentsNO = documentNo,


                    })


                    .Where(x => detailIds.Contains(x.Id))


@@ -697,7 +699,7 @@




                return (flowControl: false, value: WebResponseContent.Instance.Error($"回传MES失败"));


            }


          




            var updates = pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList();


            updates.ForEach(x =>


            {


@@ -727,7 +729,8 @@


                await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()


                    .SetColumns(x => new Dt_OutboundOrder


                    {


                        ReturnToMESStatus = 1,Remark="",


                        ReturnToMESStatus = 1,


                        Remark = "",


                        OrderStatus = newStatus


                    })


                    .Where(x => x.OrderNo == orderNo)


@@ -905,7 +908,7 @@


                        _logger.LogError(errorMsg);




                        await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()


                          .SetColumns(x => x.ReturnToMESStatus ==2)


                          .SetColumns(x => x.ReturnToMESStatus == 2)


                          .Where(x => x.OrderId == outboundOrder.Id)


                          .ExecuteCommandAsync();