1

dengjunjie

7 天以前 a770206c91e495b802b3e9371e06834586ad7715

1

 н¨Îļþ¼Ð/PDA/manifest.json

@@ -2,8 +2,8 @@
    "name" : "fC.WMS-PDA",
    "appid" : "__UNI__F08B99B",
    "description" : "",
    "versionName" : "9",
    "versionCode" : 9,
    "versionName" : "10",
    "versionCode" : 10,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 н¨Îļþ¼Ð/PDA/pages/stash/Checkoutorder.vue

@@ -55,7 +55,7 @@
                pageNo: 1,
                scrollTop: 0,
                warehouseId: "",
                isLoaded:false
                ischeck:false
            }
        },
        onLoad(res) {
@@ -66,10 +66,14 @@
        onReachBottom() {
            this.pageNo += 1;
            this.getData();
            this.isLoaded=true;
            this.ischeck=true;
        },
        onShow() {
            if (this.isLoaded) {
            this.ischeck = uni.getStorageSync('ischeck');
            if (this.ischeck) {
                uni.removeStorageSync('ischeck');
                this.pageNo = 1;
                this.allReceivingOrders = [];
                // ä»Žå…¶ä»–页面返回时刷新
                this.getData();
            }

 н¨Îļþ¼Ð/PDA/pages/stash/CheckoutorderDetail.vue

@@ -60,6 +60,7 @@
            if (this.checkTask) {
                uni.removeStorageSync('checkTask');
                this.pageNo = 1;
                this.allReceivingOrders = [];
                // ä»Žå…¶ä»–页面返回时刷新
                this.getData();
            }
@@ -85,7 +86,7 @@
                        isCheck: true,
                    },
                }
                if (this.pageNo == 1) this.allReceivingOrders = [];
                // if (this.pageNo == 1) this.allReceivingOrders = [];
                this.$u.post('/api/DeliveryOrder/GetCheckOutTasks', postData).then((
                    res) => {
                    if (res.status) {
@@ -111,24 +112,24 @@
                            //this.allReceivingOrders = [];
                            this.loadVisible = true;
                            if (this.allReceivingOrders.length < 1) {
                                uni.showModal({
                                    title: '提示',
                                    content: '盘点已完成，是否返回首页？',
                                    success: (res) => {
                                        uni.getStorageSync('isLoaded',true)
                                        if (res.confirm) {
                                            // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                // uni.showModal({
                                //     title: '提示',
                                //     content: '盘点已完成，是否返回首页？',
                                //     success: (res) => {
                                        uni.getStorageSync('ischeck',true)
                                //         if (res.confirm) {
                                //             // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                            setTimeout(() => {
                                                uni.navigateBack({
                                                    delta: 1
                                                });
                                            }, 500);
                                        } else {
                                            // ç”¨æˆ·ç‚¹å‡»å–消，可以停留在当前页面
                                            // æˆ–者执行其他操作
                                        }
                                    }
                                });
                                //         } else {
                                //             // ç”¨æˆ·ç‚¹å‡»å–消，可以停留在当前页面
                                //             // æˆ–者执行其他操作
                                //         }
                                //     }
                                // });
                            }
                        }
                    }

 н¨Îļþ¼Ð/PDA/pages/stash/inboundorderDetail.vue

@@ -108,24 +108,24 @@
                                //this.allReceivingOrders = [];
                                this.loadVisible = true;
                                if (this.allReceivingOrders.length < 1) {
                                    uni.showModal({
                                        title: '提示',
                                        content: '入库已完成，是否返回入库单？',
                                        success: (res) => {
                                            if (res.confirm) {
                                    // uni.showModal({
                                    //     title: '提示',
                                    //     content: '入库已完成，是否返回入库单？',
                                    //     success: (res) => {
                                    //         if (res.confirm) {
                                                uni.setStorageSync('isLoaded', true);
                                                // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                    //             // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                                setTimeout(() => {
                                                    uni.navigateBack({
                                                        delta:1
                                                    });
                                                }, 500);
                                            } else {
                                                // ç”¨æˆ·ç‚¹å‡»å–消，可以停留在当前页面
                                                // æˆ–者执行其他操作
                                            }
                                        }
                                    });
                                    //         } else {
                                    //             // ç”¨æˆ·ç‚¹å‡»å–消，可以停留在当前页面
                                    //             // æˆ–者执行其他操作
                                    //         }
                                    //     }
                                    // });
                                }
                            }
                        }

 н¨Îļþ¼Ð/PDA/pages/stash/outboundorder.vue

@@ -72,6 +72,8 @@
            this.isout = uni.getStorageSync('isout');
            if (this.isout) {
                uni.removeStorageSync('isout');
                this.pageNo = 1;
                this.allReceivingOrders = [];
                // ä»Žå…¶ä»–页面返回时刷新
                this.getData();
            }

 н¨Îļþ¼Ð/PDA/pages/stash/outboundorderDetail.vue

@@ -60,6 +60,7 @@
            if (this.outTask) {
                uni.removeStorageSync('outTask');
                this.pageNo = 1;
                this.allReceivingOrders = [];
                // ä»Žå…¶ä»–页面返回时刷新
                this.getData();
            }
@@ -124,7 +125,7 @@
                        isCheck: false,
                    },
                }
                if (this.pageNo == 1) this.allReceivingOrders = [];
                // if (this.pageNo == 1) this.allReceivingOrders = [];
                this.$u.post('/api/DeliveryOrder/GetCheckOutTasks', postData).then((
                    res) => {
                    if (res.status) {
@@ -149,26 +150,26 @@
                            this.status = 'noMore';
                            //this.allReceivingOrders = [];
                            this.loadVisible = true;
                            if (this.allReceivingOrders.length < 1) {
                                uni.showModal({
                                    title: '提示',
                                    content: '出库已完成，是否返回首页？',
                                    success: (res) => {
                                        if (res.confirm) {
                                            uni.getStorageSync('isLoaded',true)
                                            // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                            // if (this.allReceivingOrders.length < 1) {
                            //     uni.showModal({
                            //         title: '提示',
                            //         content: '出库已完成，是否返回首页？',
                            //         success: (res) => {
                            //             if (res.confirm) {
                                            uni.getStorageSync('isout',true)
                            //                 // ç”¨æˆ·ç‚¹å‡»ç¡®å®š
                                            setTimeout(() => {
                                                uni.navigateBack({
                                                    delta: 1
                                                });
                                            }, 500);
                                        } else {
                                            // ç”¨æˆ·ç‚¹å‡»å–消，可以停留在当前页面
                                            // æˆ–者执行其他操作
                                        }
                                    }
                                });
                            }
                            //             } else {
                            //                 // ç”¨æˆ·ç‚¹å‡»å–消，可以停留在当前页面
                            //                 // æˆ–者执行其他操作
                            //             }
                            //         }
                            //     });
                            // }
                        }
                    }
                })

 н¨Îļþ¼Ð/WIDESEA_WMSServer/ClassLibrary2/ContainerService.cs

@@ -86,7 +86,7 @@
                            Modifier = "System"
                        };
                        addList.Add(dto);
                        if (cool.Alarm != "正常")
                        if (item.alarm != "正常")
                        {
                            _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, $"冷柜{item.alarm}", item.message, MessageStatusEnum.Undisposed);
                        }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/ClassLibrary2/EquipmentAlarmInforService.cs

@@ -75,9 +75,9 @@
                                Creater = "System"
                            };
                            BaseDal.AddData(newRecord);
                            if(robot.status== "error")
                            if (robot.status == "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, robot.robotName,$"{ robot.robotName}发生错误", MessageStatusEnum.Emergency);
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "小车名称:" + robot.robotName, $"小车编号【{robot.robotCode}】发生错误", MessageStatusEnum.Emergency);
                            }
                        }
                        else
@@ -91,7 +91,7 @@
                            BaseDal.UpdateData(existingRecord);
                            if (robot.status == "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, robot.robotName, $"{robot.robotName}发生错误", MessageStatusEnum.Emergency);
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "小车名称:" + robot.robotName, $"小车编号【{robot.robotCode}】发生错误", MessageStatusEnum.Emergency);
                            }
                        }
                        saveCount++;
@@ -121,7 +121,7 @@
                            BaseDal.AddData(newRecord);
                            if (sorter.status == "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, sorter.sorterName, $"{sorter.sorterName}发生错误", MessageStatusEnum.Emergency);
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "分拣台名称:" + sorter.sorterName, $"编号【{sorter.sorterCode}】发生错误", MessageStatusEnum.Emergency);
                            }
                        }
                        else
@@ -135,7 +135,7 @@
                            BaseDal.UpdateData(existingRecord);
                            if (sorter.status == "error")
                            {
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, sorter.sorterName, $"{sorter.sorterName}发生错误", MessageStatusEnum.Emergency);
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.EquipmentAlarm, "分拣台名称:" + sorter.sorterName, $"编号【{sorter.sorterCode}】发生错误", MessageStatusEnum.Emergency);
                            }
                        }
                        saveCount++;

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Core/DB/Models/BaseEntity.cs

@@ -39,7 +39,7 @@
        /// åˆ›å»ºè€…
        /// </summary>
        [ImporterHeader(Name = "创建者")]
        [ExporterHeader(DisplayName = "创建者")]
        [ExporterHeader(DisplayName = "创建者", IsIgnore = true)]
        [SugarColumn(IsNullable = false, Length = 50, IsOnlyIgnoreUpdate = true, ColumnDescription = "创建者")]
        public string Creater { get; set; }

@@ -47,7 +47,7 @@
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        [ImporterHeader(Name = "创建时间")]
        [ExporterHeader(DisplayName = "创建时间")]
        [ExporterHeader(DisplayName = "创建时间", IsIgnore = true)]
        [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "创建时间")]
        public DateTime CreateDate { get; set; } = DateTime.Now;

@@ -59,7 +59,7 @@
        /// æ›´æ–°è€…
        /// </summary>
        [ImporterHeader(Name = "修改人")]
        [ExporterHeader(DisplayName = "修改人")]
        [ExporterHeader(DisplayName = "修改人", IsIgnore = true)]
        [SugarColumn(IsNullable = true, Length = 50, IsOnlyIgnoreInsert = true, ColumnDescription = "修改人")]
        public string Modifier { get; set; }

@@ -67,7 +67,7 @@
        /// ä¿®æ”¹æ—¥æœŸ
        /// </summary>
        [ImporterHeader(Name = "修改日期")]
        [ExporterHeader(DisplayName = "修改日期")]
        [ExporterHeader(DisplayName = "修改日期", IsIgnore = true)]
        [SugarColumn(IsNullable = true, IsOnlyIgnoreInsert = true, ColumnDescription = "修改日期")]
        public DateTime? ModifyDate { get; set; }


 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_InventoryInfo.cs

@@ -16,7 +16,7 @@
        /// ä¸»é”®
        /// </summary>
        [ImporterHeader(Name = "主键")]
        [ExporterHeader(DisplayName = "主键")]
        [ExporterHeader(DisplayName = "主键", IsIgnore = true)]
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
        public int Id { get; set; }

@@ -24,7 +24,7 @@
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        [ImporterHeader(Name = "托盘编号")]
        [ExporterHeader(DisplayName = "托盘编号")]
        [ExporterHeader(DisplayName = "托盘编号", IsIgnore = true)]
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "托盘编号")]
        public string PalletCode { get; set; }

@@ -32,13 +32,13 @@
        /// åº“房编号
        /// </summary>
        [ImporterHeader(Name = "库房编号")]
        [ExporterHeader(DisplayName = "库房编号")]
        [ExporterHeader(DisplayName = "库房编号", IsIgnore = true)]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "库房编号")]
        public string WarehouseCode { get; set; }

        /// <summary>
        /// è´§ä½ç¼–号 //要是是立库的就是要==“立库‘ å¹³åº“的就是有编码的
         /// </summary> 
        /// </summary> 
        [ImporterHeader(Name = "货位编号")]
        [ExporterHeader(DisplayName = "货位编号")]
        [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "货位编号")]
@@ -48,7 +48,7 @@
        /// åº“存状态
        /// </summary>
        [ImporterHeader(Name = "库存状态")]
        [ExporterHeader(DisplayName = "库存状态")]
        [ExporterHeader(DisplayName = "库存状态", IsIgnore = true)]
        [SugarColumn(IsNullable = false, ColumnDescription = "库存状态")]
        public int StockStatus { get; set; }

@@ -88,7 +88,7 @@
        /// å®žé™…总库存数
        /// </summary>
        [ImporterHeader(Name = "实际库存数")]
        [ExporterHeader(DisplayName = "实际库存数")]
        [ExporterHeader(DisplayName = "库存数")]
        [SugarColumn(IsNullable = false, ColumnDescription = "实际库存数")]
        public decimal StockQuantity { get; set; }

@@ -96,7 +96,7 @@
        /// å¾…出库数  æ•´ä¸ªå‡ºåº“单占用的
        /// </summary>
        [ImporterHeader(Name = "待出库数")]
        [ExporterHeader(DisplayName = "待出库数")]
        [ExporterHeader(DisplayName = "待出库数", IsIgnore = true)]
        [SugarColumn(IsNullable = false, ColumnDescription = "出库数", DefaultValue = "0")]
        public decimal OutboundQuantity { get; set; }

@@ -104,13 +104,17 @@
        /// <summary>
        /// å¯ç”¨åº“存数量  =实际库存数-待出库数量
        /// </summary>
        [ImporterHeader(Name = "可用库存数量")]
        [ExporterHeader(DisplayName = "可用库存数量", IsIgnore = true)]
        [SugarColumn(IsNullable = false, ColumnDescription = "可用库存数量", DefaultValue = "0")]
        public decimal AvailableQuantity { get; set; }

        /// <summary>
        /// æŠ¥è­¦ä¿¡æ¯
        /// </summary>
         [SugarColumn(IsNullable = true,Length =255, ColumnDescription = "报警信息")]
        [ImporterHeader(Name = "报警信息")]
        [ExporterHeader(DisplayName = "报警信息", IsIgnore = true)]
        [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "报警信息")]
        public string AlarmInformation { get; set; }


@@ -118,7 +122,7 @@
        /// ç›˜ç‚¹æ•°ï¼›ç›˜ç‚¹åŽå®žé™…数量
        /// </summary>
        [ImporterHeader(Name = "盘点数")]
        [ExporterHeader(DisplayName = "盘点数")]
        [ExporterHeader(DisplayName = "盘点数", IsIgnore = true)]
        [SugarColumn(IsNullable = false, ColumnDescription = "盘点数", DefaultValue = "0")]
        public decimal SupplyQuantity { get; set; }

@@ -126,7 +130,7 @@
        /// å…¥åº“时间
        /// </summary>
        [ImporterHeader(Name = "入库时间")]
        [ExporterHeader(DisplayName = "入库时间")]
        [ExporterHeader(DisplayName = "入库时间", IsIgnore = true)]
        [SugarColumn(IsNullable = true, ColumnDescription = "入库时间")]
        public DateTime? InDate { get; set; }

@@ -134,7 +138,7 @@
        /// ç”Ÿäº§æ—¥æœŸ
        /// </summary>
        [ImporterHeader(Name = "生产日期")]
        [ExporterHeader(DisplayName = "生产日期")]
        [ExporterHeader(DisplayName = "生产日期", IsIgnore = true)]
        [SugarColumn(IsNullable = true, ColumnDescription = "生产日期")]
        public string ProductionDate { get; set; }

@@ -142,7 +146,7 @@
        /// ä¿è´¨æœŸ
        /// </summary>
        [ImporterHeader(Name = "保质期")]
        [ExporterHeader(DisplayName = "保质期")]
        [ExporterHeader(DisplayName = "保质期", IsIgnore = true)]
        [SugarColumn(IsNullable = false, ColumnDescription = "保质期")]
        public int ShelfLife { get; set; }

@@ -158,7 +162,7 @@
        /// å¤‡æ³¨
        /// </summary>
        [ImporterHeader(Name = "备注")]
        [ExporterHeader(DisplayName = "备注")]
        [ExporterHeader(DisplayName = "库房")]
        [SugarColumn(IsNullable = true, ColumnDescription = "备注")]
        public string Remark { get; set; }
    }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask.cs

@@ -15,7 +15,7 @@
    /// ä»»åŠ¡ä¿¡æ¯
    /// </summary>
    [SugarTable(nameof(Dt_SupplyTask), "盘点任务信息"), SugarIndex("unique_task_taskNum", nameof(TaskNum), OrderByType.Asc, true)]
    public class Dt_SupplyTask : BaseEntity 
    public class Dt_SupplyTask : BaseEntity

    {
        /// <summary>
@@ -134,7 +134,7 @@
        /// ä»»åŠ¡ä¸‹å‘时间
        /// </summary>
        [ImporterHeader(Name = "任务下发时间")]
        [ExporterHeader(DisplayName = "创建时间")]
        [ExporterHeader(DisplayName = "任务下发时间", IsIgnore = true)]
        [SugarColumn(IsNullable = true, ColumnDescription = "任务下发时间")]
        public DateTime? Dispatchertime { get; set; }

@@ -142,7 +142,7 @@
        /// å¤‡æ³¨
        /// </summary>
        [ImporterHeader(Name = "备注")]
        [ExporterHeader(DisplayName = "备注")]
        [ExporterHeader(DisplayName = "类型")]
        [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "备注")]
        public string Remark { get; set; }
    }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_Model/Models/WMSInfo/Dt_SupplyTask_Hty.cs

@@ -17,6 +17,8 @@
    [SugarTable(nameof(Dt_SupplyTask_Hty), "任务信息历史")]
    public class Dt_SupplyTask_Hty : Dt_SupplyTask, IBaseHistoryEntity
    {
        [ImporterHeader(Name = "任务号")]
        [ExporterHeader(DisplayName = "任务号", IsIgnore = true)]
        public new int TaskNum { get; set; }
        /// <summary>
        /// åŽŸè¡¨ä¸»é”®
@@ -30,7 +32,7 @@
        /// æ“ä½œç±»åž‹
        /// </summary>
        [ImporterHeader(Name = "操作类型")]
        [ExporterHeader(DisplayName = "操作类型")]
        [ExporterHeader(DisplayName = "操作类型", IsIgnore = true)]
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "操作类型")]
        public string OperateType { get; set; }


 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/Business.cs

@@ -69,7 +69,7 @@
                if (response == null || response.resultCode != "0" || requestData == null)
                {
                    // è°ƒç”¨å¼‚常接口
                    SendErrorToUpstream(1, "", response.resultMsg ?? "上游接口返回失败", "");
                    //SendErrorToUpstream(1, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }

@@ -154,7 +154,7 @@
                    {
                        _unitOfWorkManage.RollbackTran();
                        _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
                        SendErrorToUpstream(1, "", ex.Message, "");
                        //SendErrorToUpstream(1, "", ex.Message, "");
                        //return responseContent.Error("同步失败: " + ex.Message);
                    }
                };
@@ -164,7 +164,7 @@
            catch (Exception ex)
            {
                // å…¨å±€å¼‚常时，也推送异常给上游
                SendErrorToUpstream(1, "", ex.Message, "");
                //SendErrorToUpstream(1, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
@@ -193,7 +193,7 @@

                if (response.resultCode != "0")
                {
                    SendErrorToUpstream(3, "", response.resultMsg ?? "上游接口返回失败", "");
                    //SendErrorToUpstream(3, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }

@@ -282,7 +282,7 @@
                    {
                        _unitOfWorkManage.RollbackTran();
                        _messageInfoService.AddMessageInfo(messageGroupBy, name, ex.Message, messageStatus);
                        SendErrorToUpstream(3, "", ex.Message, "");
                        //SendErrorToUpstream(3, "", ex.Message, "");
                        //return responseContent.Error("同步失败: " + ex.Message);
                    }
                }
@@ -290,7 +290,7 @@
            }
            catch (Exception ex)
            {
                SendErrorToUpstream(3, "", ex.Message, "");
                //SendErrorToUpstream(3, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
@@ -395,7 +395,7 @@
                    }
                    else
                    {
                        SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS æŽ¨é€å¤±è´¥", "");
                        //SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS æŽ¨é€å¤±è´¥", "");
                        Console.WriteLine($"订单 {order.Order_no} æŽ¨é€å¤±è´¥ï¼š{resp?.msg}");
                        return new WebResponseContent { Status = false, Message = "订单推送失败" };
                    }
@@ -507,14 +507,14 @@
                        }
                        else
                        {
                            SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS æŽ¨é€å¤±è´¥", "");
                            //SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS æŽ¨é€å¤±è´¥", "");
                            Console.WriteLine($"订单 {order.Out_no} æŽ¨é€å¤±è´¥ï¼š{resp?.msg}");
                        }
                        //删除全部状为已完成的明细和表头，移入历史表
                    }
                    catch (Exception ex)
                    {
                        SendErrorToUpstream(3, order.Out_no, ex.Message, "");
                        //SendErrorToUpstream(3, order.Out_no, ex.Message, "");
                        Console.WriteLine($"订单 {order.Out_no} æŽ¨é€å¼‚常：{ex.Message}");
                    }
                }
@@ -546,7 +546,7 @@
                foreach (var inorder in inorders)
                {
                    var Orders = _cabinOrderServices.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == inorder).Includes(x => x.Details).ToList();
                    

                    if (!Orders.Where(x => x.OdrderStatus != "已完成").Any())
                    {
                        if (Orders.FirstOrDefault().Order_type == InOrderTypeEnum.Allocat.ObjToInt().ToString())
@@ -581,11 +581,16 @@
                            }
                            else
                            {
                                string mess = "上报ERP无响应";
                                if (response != null) mess = response.resultMsg;
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, $"入库单号【{inorder}】完成上报ERP失败", mess);
                                //_unitOfWorkManage.RollbackTran();
                                SendErrorToUpstream(2, "", $"上游接口返回失败: {response.resultMsg}", inorder);
                                //SendErrorToUpstream(2, "", $"上游接口返回失败: {response.resultMsg}", inorder);
                                continue;
                            }
                        }
                        

                    }
                }
                #endregion
@@ -639,7 +644,7 @@
                            };
                            var result = HttpHelper.Post(url, requestDate.ToJsonString());
                            var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
                            if (response.resultCode == "0")
                            if (response != null && response.resultCode == "0")
                            {
                                foreach (var item in Orders)
                                {
@@ -651,8 +656,11 @@
                            }
                            else
                            {
                                string mess = "上报ERP无响应";
                                if (response != null) mess = response.resultMsg;
                                _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, $"出库单号【{outorder}】完成上报ERP失败", mess);
                                //_unitOfWorkManage.RollbackTran();
                                SendErrorToUpstream(4, "", $"上游接口返回失败: {response.resultMsg}", outorder);
                                //SendErrorToUpstream(4, "", $"上游接口返回失败: {response.resultMsg}", outorder);
                                continue;
                            }
                        }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs

@@ -199,6 +199,21 @@
                        Creater = App.User.UserName,
                        CreateDate = DateTime.Now,
                    };
                    switch (inventoryInfo.WarehouseCode)
                    {
                        case "001":
                            inventoryInfo.Remark = "智能立库";
                            break;
                        case "002":
                            inventoryInfo.Remark = "大件库";
                            break;
                        case "003":
                            inventoryInfo.Remark = "麻精库";
                            break;
                        case "010":
                            inventoryInfo.Remark = "冷冻库";
                            break;
                    }
                    _inventoryInfoService.AddData(inventoryInfo);
                }
                #endregion

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CustomerServices.cs

@@ -45,7 +45,7 @@
                if (response.resultCode!="0")
                {
                    // è°ƒç”¨å¼‚常接口
                    SendErrorToUpstream(7, "", response.resultMsg ?? "上游接口返回失败", "");
                    //SendErrorToUpstream(7, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }
                if (response.data == null || !response.data.Any())
@@ -70,7 +70,7 @@
            }
            catch (Exception ex)
            {
                SendErrorToUpstream(7, "", ex.Message, "");
                //SendErrorToUpstream(7, "", ex.Message, "");
                return responseContent.Error(ex.Message);
            }
        }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs

@@ -453,6 +453,7 @@
                        BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
                    #endregion
                }
                webResponseContent.OK();
            }
            catch (Exception ex)
            {

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs

@@ -54,7 +54,7 @@

                if (response.resultCode != "0")
                {
                    SendErrorToUpstream(8, "", response.resultMsg ?? "上游接口返回失败", "");
                    //SendErrorToUpstream(8, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }

@@ -82,7 +82,7 @@
            catch (Exception ex)
            {
                Db.Ado.RollbackTran();
                SendErrorToUpstream(8, "", ex.Message, "");
                //SendErrorToUpstream(8, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }
@@ -229,7 +229,7 @@
                                            ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
                                            ShelfLife = 0,
                                            ValidityPeriod = cabinOrderDetail.Exp_date,
                                            Remark = "WCS回传创建"
                                            Remark = "智能立库"
                                        };
                                        BaseDal.Db.Insertable(inventoryInfo).ExecuteCommand();
                                    }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/MedicineGoodsServices.cs

@@ -27,7 +27,7 @@
        }
        public IRepository<Dt_MedicineGoods> Repository => BaseDal;

        static string SearchDate = "";
        static string SearchDate = "2025-10-1 20:45:16";

        /// <summary>
        /// èŽ·å–药品基础信息同步接口
@@ -44,21 +44,21 @@

                //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                //请求参数
                var requestData = new
                {
                    searchDate = "2009-01-10 20:45:16"  // æ­£ç¡®çš„格式
                };
                //if (string.IsNullOrEmpty(SearchDate))
                //{
                //    // é»˜è®¤æŸ¥è¯¢è¿‡åŽ»24小时的数据
                //    SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
                //}
                // è¯·æ±‚参数
                //var requestData = new
                //{
                //    searchDate = SearchDate
                //    searchDate = "2009-01-10 20:45:16"  // æ­£ç¡®çš„格式
                //};
                //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
                if (string.IsNullOrEmpty(SearchDate))
                {
                    // é»˜è®¤æŸ¥è¯¢è¿‡åŽ»24小时的数据
                    SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
                }
                // è¯·æ±‚参数
                var requestData = new
                {
                    searchDate = SearchDate
                };
                SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
                // å‘起请求
                var result = HttpHelper.Post(url, requestData.ToJsonString());

@@ -68,7 +68,7 @@
                if (response.resultCode != "0")
                {
                    // è°ƒç”¨å¼‚常接口
                    SendErrorToUpstream(5, "", response.resultMsg ?? "上游接口返回失败", "");
                    //SendErrorToUpstream(5, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }
                if (response.data == null || !response.data.Any())
@@ -114,7 +114,7 @@

            catch (Exception ex)
            {
                SendErrorToUpstream(5, "", ex.Message, "");
                //SendErrorToUpstream(5, "", ex.Message, "");
                return responseContent.Error(ex.Message);
            }
        }
@@ -185,9 +185,9 @@
                    }
                    else
                    {
                        SendErrorToUpstream(5, medicineDTO.materialCode, resp?.msg ?? "WCS药品信息同步失败", "");

                        return new WebResponseContent { Status = false, Message = "订单推送失败" };
                        //SendErrorToUpstream(5, medicineDTO.materialCode, resp?.msg ?? "WCS药品信息同步失败", "");
                        //return new WebResponseContent { Status = false, Message = "订单推送失败" };
                        continue;
                    }

                }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/SupplierServices.cs

@@ -47,7 +47,7 @@
                if (response.resultCode!="0")
                {
                    //调用异常接口
                    SendErrorToUpstream(6, "", response.resultMsg ?? "上游接口返回失败", "");
                    //SendErrorToUpstream(6, "", response.resultMsg ?? "上游接口返回失败", "");
                    return responseContent.Error(response.resultMsg ?? "上游接口返回失败");
                }
                if (response.data == null || !response.data.Any())
@@ -73,7 +73,7 @@
            catch (Exception ex)
            {

                SendErrorToUpstream(6, "", ex.Message, "");
                //SendErrorToUpstream(6, "", ex.Message, "");
                return responseContent.Error("同步失败: " + ex.Message);
            }
        }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs

@@ -46,7 +46,7 @@
                foreach (var item in dt_InventoryInfos)
                {
                    if (materielInfo.Business_qty >= materielInfo.MinQty) break;
                    item.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                    //item.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                    while (item.StockQuantity > item.OutboundQuantity && materielInfo.Business_qty < materielInfo.MinQty)
                    {
                        Qty += materielInfo.BoxQty;

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/AlarmJob.cs

@@ -19,7 +19,7 @@
            _inventoryInfoService = inventoryInfoService;
        }
        //每隔1秒执行一次
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)]
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 60, IsEnabled = true, SkipWhileExecuting = true)]
        public void Run()
        {
            //冷库

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/GoodsJob.cs

@@ -12,7 +12,7 @@
            _medicineGoodsServices = medicineGoodsServices;
        }
        //每隔1秒执行一次
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 60, IsEnabled = false, SkipWhileExecuting = true)]
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 30, IsEnabled = true, SkipWhileExecuting = true)]
        public void Run()
        {
            _medicineGoodsServices.GetMedicineGoodsInfom();

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/InOrderJob.cs

@@ -11,11 +11,11 @@
            _business = business;
        }
        //每隔1秒执行一次
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 10, IsEnabled =false,SkipWhileExecuting = true)]
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 30, IsEnabled =true,SkipWhileExecuting = true)]
        public void Run()
        {
            //_business.GetUpstreamOrder();
            //_business.EdiIn();
            _business.GetUpstreamOrder();
            _business.EdiIn();
            _business.CompleteAllOrders();
        }
    }

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/OutOrderJob.cs

@@ -11,7 +11,7 @@
            _business = business;
        }
        //每隔1秒执行一次
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 10, IsEnabled = false, SkipWhileExecuting = true)]
        [Invoke(Begin = "2025-09-01", Interval = 1000 * 30, IsEnabled = true, SkipWhileExecuting = true)]
        public void Run()
        {
            //获取上游出库单数据

 н¨Îļþ¼Ð/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json

@@ -17,6 +17,7 @@
  //"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=WMS_TC;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //旧WMS数据库连接
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WMSDBF_Z22;User ID=sa;Password=48PYX_h7KS@f;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称
@@ -30,6 +31,6 @@
  "ApiName": "WIDESEA",
  "ExpMinutes": 120,
  "DBSeedEnable": false, //是否启用数据库种子数据，创建表
  "PDAVersion": "8",
  "PDAVersion": "10",
  "WebSocketPort": 9296
}

 н¨Îļþ¼Ð/WMS/src/views/basic/locationInfo.vue

@@ -95,12 +95,7 @@
          type: "int",
          span: 8
        },
        {
          field: "layer",
          title: "货位层",
          type: "int",
          span: 8
        }
      
      ],
      [
        {
@@ -109,13 +104,19 @@
          type: "int",
          span: 12
        },
        {
          field: "locationType",
          title: "货位类型",
          type: "select",
          span: 12,
          data: [],
          dataKey:  "locationTypeEnum",
        // {
        //   field: "locationType",
        //   title: "货位类型",
        //   type: "select",
        //   span: 12,
        //   data: [],
        //   dataKey:  "locationTypeEnum",
        // }
          {
          field: "layer",
          title: "货位层",
          type: "int",
          span: 8
        }
      ],
      [
@@ -136,14 +137,14 @@
          data: [],
        }
      ],
      [
        {
          field: "remark",
          title: "备注",
          type: "string",
          span: 24
        }
      ]
      // [
      //   {
      //     field: "remark",
      //     title: "备注",
      //     type: "string",
      //     span: 24
      //   }
      // ]
    ]);
    const searchFormFields = ref({
      // warehouseId: "",
@@ -167,13 +168,12 @@
      ],
      [
        { title: "巷道编号", field: "roadwayNo", type: "like" },
        { title: "货位类型", field: "locationType", type: "select",  dataKey:  "locationTypeEnum", data: []  },       
        // { title: "货位类型", field: "locationType", type: "select",  dataKey:  "locationTypeEnum", data: []  },       
        { title: "货位状态", field: "locationStatus", type: "select",  dataKey:  "locationStatusEnum",data: []},

         { title: "禁用状态", field: "enableStatus", type: "select", data: [], dataKey:"status" },
      ],
      [

         { title: "禁用状态", field: "enableStatus", type: "select", data: [], dataKey:"status" },
        { title: "行", field: "row", type: "int" },
        { title: "列", field: "column", type: "int" },
        { title: "层", field: "layer", type: "int" }
@@ -257,15 +257,15 @@
        width: 100,
        align: "left",
      },
      {
        field: "locationType",
        title: "货位类型",
        type: "select",
        width: 120,
        align: "left",
        data: [],
        bind: { key: "locationTypeEnum", data: [] }
      },
      // {
      //   field: "locationType",
      //   title: "货位类型",
      //   type: "select",
      //   width: 120,
      //   align: "left",
      //   data: [],
      //   bind: { key: "locationTypeEnum", data: [] }
      // },
      {
        field: "locationStatus",
        title: "货位状态",
@@ -284,13 +284,13 @@
        data: [],
        bind: { key: "status", data: [] },
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 150,
        align: "left",
      },
      // {
      //   field: "remark",
      //   title: "备注",
      //   type: "string",
      //   width: 150,
      //   align: "left",
      // },
      {
        field: "creater",
        title: "创建人",

 н¨Îļþ¼Ð/WMS/src/views/basic/materielInfo.vue

@@ -57,13 +57,13 @@
const editFormOptions = ref([
  // ç¬¬ä¸€è¡Œï¼šå…³é”®ä¿¡æ¯
  [
    {
      title: "物料编号",
      field: "materielCode",
      type: "string",
      span: 12,
      required: true,
    },
  //   {
  //     title: "物料编号",
  //     field: "materielCode",
  //     type: "string",
  //     span: 12,
  //     required: true,
  //   },
    {
      title: "物料名称",
      field: "materielName",

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder.vue

@@ -275,8 +275,8 @@
          width: 120,
          align: "left",
          bind: { key: "warehouseNuber", data: [] },
          edit:{type:'select',dataKey:'warehouseNuber',data:[]},
          edit:{type:""}
          // edit:{type:'select',dataKey:'warehouseNuber',data:[]},
          // edit:{type:""}
        },
           {
          field: "goods_no",
@@ -285,7 +285,7 @@
          width: 150,
          align: "left",
          required: true,
          edit:{type:""},
          // edit:{type:""},
          bind: { key: "MaterielNames", data: [] },
        },
        {
@@ -296,7 +296,7 @@
          align: "left",
          bind: { key: "medicineGoods", data: [] },
          required: true,
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -306,7 +306,7 @@
          width: 120,
          align: "left",
          required: true,
          edit:{type:"number"}
          // edit:{type:"number"}

        },
        {
@@ -315,7 +315,7 @@
          type: "decimal",
          width: 120,
          align: "left",
          edit:{type:"number"}
          // edit:{type:"number"}

        },
        {
@@ -325,7 +325,7 @@
          width: 120,
          align: "left",
          required: true,
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -334,7 +334,7 @@
          type: "string",
          width: 120,
          align: "left",
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -344,7 +344,7 @@
          width: 120,
          align: "left",
          // bind: { key: "orderDetailStatus", data: [] },
          edit:{type:""}
          // edit:{type:""}

        },
        {
@@ -354,7 +354,7 @@
          width: 120,
          align: "left",
          bind: { key: "syncStatus", data: [] },
          edit:{type:'select',dataKey:'syncStatus',data:[]}
          // edit:{type:'select',dataKey:'syncStatus',data:[]}
        },
        {
          field: "creater",

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder.vue

@@ -264,7 +264,7 @@
                        width: 120,
                        align: 'left',
                        bind: { key: "warehouseNuber", data: [] },
                        edit:{type:""}
                        // edit:{type:""}

                    },
                    {
@@ -274,7 +274,7 @@
                        width: 150,
                        align: "left",
                        required: true,
                        edit:{type:""},
                        // edit:{type:""},
                        bind: { key: "MaterielNames", data: [] },
                    },
                    {
@@ -285,7 +285,7 @@
                        require: true,
                        align: 'left',
                        bind: { key: "medicineGoods", data: [] },
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'order_qty',
@@ -294,7 +294,7 @@
                        width: 100,
                        require: true,
                        align: 'left',
                        edit:{type:"number"}
                        // edit:{type:"number"}
                    },
                       {
                        field: 'order_Outqty',
@@ -303,7 +303,7 @@
                        width: 100,
                        require: true,
                        align: 'left',
                        edit:{type:"number"}
                        // edit:{type:"number"}
                    },
                    {
                        field: 'batch_num',
@@ -312,7 +312,7 @@
                        width: 120,
                        require: true,
                        align: 'left',
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'exp_date',
@@ -320,7 +320,7 @@
                        type: 'string',
                        width: 120,
                        align: 'left',
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'ootDetailStatus',
@@ -328,7 +328,7 @@
                        type: 'string',
                        width: 120,
                        align: 'left',
                        edit:{type:""}
                        // edit:{type:""}
                    },
                    {
                        field: 'status',
@@ -337,7 +337,7 @@
                        width: 120,
                        align: 'left',
                        bind: { key: "syncStatus", data: [] },
                        edit:{type:'select',dataKey:'syncStatus',data:[]}
                        // edit:{type:'select',dataKey:'syncStatus',data:[]}
                    },
                    {
                        field: 'creater',

 н¨Îļþ¼Ð/WMS/src/views/stock/stockInfo.vue

@@ -243,6 +243,7 @@
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        hidden: true,
        width: 90,
        align: "left",
      },
@@ -342,12 +343,14 @@
        field: "productionDate",
        title: "生产日期",
        type: "date",
        hidden: true,
        width: 120,
        align: "left",
      },
      {
        field: "shelfLife",
        title: "保质期天数",
        hidden: true,
        type: "number",
        width: 120,
        align: "left",
@@ -363,6 +366,7 @@
        field: "alarmInformation",
        title: "报警信息",
        type: "string",
        hidden: true,
        width: 120,
        align: "left",
      },

 н¨Îļþ¼Ð/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue

@@ -104,6 +104,7 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        hidden: true,
        width: 120,
        align: "left",
      },
@@ -112,6 +113,7 @@
        title: "托盘编号",
        type: "string",
        width: 120,
        hidden: true,
        align: "left",
      },
      {
@@ -200,6 +202,7 @@
        field: "dispatchertime",
        title: "任务下发时间",
        type: "datetime",
        hidden: true,
        width: 160,
        align: "left",
      },
@@ -208,6 +211,7 @@
        title: "创建人",
        type: "string",
        width: 90,
        hidden: true,
        align: "left",
      },
      {
@@ -215,6 +219,7 @@
        title: "创建时间",
        type: "datetime",
        width: 160,
        hidden: true,
        align: "left",
      },
      {