提交

heshaofeng

5 天以前 2c9627e058670e4a56437f2880270160c197dabb

提交

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/EmptyTrayOutbound.vue

@@ -11,10 +11,7 @@
      </el-form>
      <el-form ref="form" :model="form" label-width="90px">
        <el-form-item label="出库数量:">
          <el-select v-model="num" placeholder="请选择出库数量">
            <el-option v-for="item in 6" :key="item" :label="item.toString()" :value="item">
            </el-option>
          </el-select>
          <el-input-number v-model="num" :min="1" :max="999" :controls="true" placeholder="请选择出库数量" style="width: 100%;"></el-input-number>
        </el-form-item>
      </el-form>
    </template>

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/newAllocateOrderDetail.vue

@@ -201,7 +201,7 @@
          width: 90,
        },
        {
          prop: "overOutQuantity",
          prop: "moveQty",
          title: "挪料数量",
          type: "string",
          width: 90,

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue

@@ -201,7 +201,7 @@
          width: 90,
        },
        {
          prop: "overOutQuantity",
          prop: "moveQty",
          title: "挪料数量",
          type: "string",
          width: 90,

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue

@@ -202,7 +202,6 @@
        type: "string",
        width: 120,
        align: "left",
        link: true, 
      },
      {
        field: "upperOrderNo",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/stock/stockInfoDetailByMaterielSum.vue

@@ -59,14 +59,17 @@
    const searchFormFields = ref({
      materielCode: "",
      materielName: "",
      orderNo: "",
      batchNo: "",
      supplyCode:"",
      warehouseCode:""
    });
    const searchFormOptions = ref([
      [
        { title: "物料编号", field: "materielCode" ,type:'like'},
        { title: "物料名称", field: "materielName" ,type:'like'},
        { title: "单据编号", field: "orderNo" ,type:'like'},
        { title: "托盘号", field: "palletCode" ,type:'like'},
        { title: "批次号", field: "batchNo" ,type:'like'},
        { title: "供应商编号", field: "supplyCode" ,type:'like'},
        { title: "仓库号", field: "warehouseCode" ,type:'like'},
      ],
    ]);
    const columns = ref([
@@ -121,57 +124,7 @@
        type: "string",
        width: 200,
        align: "left",
      },
      {
        field: "outboundQuantity",
        title: "出库数量",
        type: "string",
        width: 180,
        align: "left",
      },
      {
        field: "status",
        title: "库存明细状态",
        type: "string",
        width: 120,
        align: "left",
        bind: { key: "stockStatusEmun", data: [] },
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      {
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      {
        field: "modifyDate",
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "remark",
        title: "备注",
        type: "string",
        width: 100,
        align: "left",
      },
      }
    ]);
    const detail = ref({
      cnName: "#detailCnName",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/taskinfo/task.vue

@@ -48,7 +48,7 @@
        { title: "创建人", field: "creater", type: "like" },
      ],
      [
        { title: "任务类型",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
        //{ title: "任务类型",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
        { title: "任务状态",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
        { title: "巷道号", field: "roadway", type: "like" },
      ],
@@ -90,14 +90,14 @@
        width: 120,
        align: "left",
      },
      {
        field: "taskType",
        title: "任务类型",
        type: "int",
        width: 120,
        align: "left",
        bind: { key: "taskType", data: [] },
      },
      // {
      //   field: "taskType",
      //   title: "任务类型",
      //   type: "int",
      //   width: 120,
      //   align: "left",
      //   bind: { key: "taskType", data: [] },
      // },
      {
        field: "taskStatus",
        title: "任务状态",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue

@@ -48,7 +48,7 @@
        { title: "创建人", field: "creater", type: "like" },
      ],
      [
        { title: "任务类型",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
        //{ title: "任务类型",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
        { title: "任务状态",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
        { title: "巷道号", field: "roadway", type: "like" },
      ],
@@ -90,14 +90,14 @@
        width: 120,
        align: "left",
      },
      {
        field: "taskType",
        title: "任务类型",
        type: "int",
        width: 120,
        align: "left",
        bind: { key: "taskType", data: [] },
      },
      // {
      //   field: "taskType",
      //   title: "任务类型",
      //   type: "int",
      //   width: 120,
      //   align: "left",
      //   bind: { key: "taskType", data: [] },
      // },
      {
        field: "taskStatus",
        title: "任务状态",

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateDetailService.cs

@@ -71,16 +71,22 @@
            //}
            //return new PageGridData<Dt_AllocateOrderDetail>(totalCount, data);

            Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == options.Filter.FirstOrDefault().Value.ObjToInt());
            Dt_OutboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
            try
            {
                Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == options.Filter.FirstOrDefault().Value.ObjToInt());
                Dt_OutboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();
                var Id = _InboundOrder == null ? 0 : _InboundOrder.Id;
                var data = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>()
                    .Where(x => x.OrderId == Id)
                    .OrderBy(orderByModels)
                    .ToPageList(options.Page, options.Rows, ref totalCount);

            var data = BaseDal.Db.Queryable<Dt_OutboundOrderDetail>()
                .WhereIF(!_InboundOrder.IsNullOrEmpty(), x => x.OrderId == _InboundOrder.Id)
                .OrderBy(orderByModels)
                .ToPageList(options.Page, options.Rows, ref totalCount);


            return new PageGridData<Dt_OutboundOrderDetail>(totalCount, data);
                return new PageGridData<Dt_OutboundOrderDetail>(totalCount, data);
            }
            catch(Exception ex)
            {
                throw new Exception("无明细");
            }
        }
    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs

@@ -539,10 +539,10 @@

            Dt_AllocateOrder allocateOrder = _allocateOrderRepository.QueryFirst(x => x.Id == (int)options.Value);
            Dt_InboundOrder _InboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_InboundOrder>().Where(x => x.UpperOrderNo == allocateOrder.UpperOrderNo).First();

            var Id = _InboundOrder == null ? 0 : _InboundOrder.Id;
            var data = BaseDal.Db.Queryable<Dt_InboundOrderDetail>()
                .WhereIF(!wheres.IsNullOrEmpty(), wheres)
                .WhereIF(!_InboundOrder.IsNullOrEmpty(), x => x.OrderId == _InboundOrder.Id)
                .Where( x => x.OrderId == Id)
                .OrderBy(orderByModels)
                .ToPageList(options.Page, options.Rows, ref totalCount);


 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutboundOrderEnum.cs

@@ -52,6 +52,11 @@
    public enum OutOrderTypeEnum
    {
        /// <summary>
        /// è°ƒæ‹¨å‡ºåº“单
        /// </summary>
        [Description("调拨出库单")]
        InternalAllocat = 117,
        /// <summary>
        /// ç”Ÿäº§è¿”工单
        /// </summary>
        [Description("生产返工单")]

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_StockService/StockDetailByMaterielService.cs

@@ -50,24 +50,31 @@
                                }
                            }
                            {
                                SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfo.WarehouseId).FirstLetterToLower());
                                SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfoDetail.WarehouseCode).FirstLetterToLower());
                                if (searchParameters != null)
                                {
                                    sugarQueryable = sugarQueryable.Where(x => x.WarehouseId.Equals(searchParameters.Value));
                                }
                            }
                            {
                                SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfo.StockStatus).FirstLetterToLower());
                                if (searchParameters != null)
                                {
                                    sugarQueryable = sugarQueryable.Where(x => x.StockStatus.Equals(searchParameters.Value));
                                    sugarQueryable1 = sugarQueryable1.Where(x => x.WarehouseCode.Contains(searchParameters.Value));
                                }
                            }
                            {
                                SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfoDetail.MaterielName).FirstLetterToLower());
                                if (searchParameters != null)
                                {
                                    sugarQueryable1 = sugarQueryable1.Where(x => x.MaterielName.Contains(searchParameters.Value));
                                    sugarQueryable1 = sugarQueryable1.Where(x => x.MaterielName.Equals(searchParameters.Value));
                                }
                            }
                            {
                                SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfoDetail.BatchNo).FirstLetterToLower());
                                if (searchParameters != null)
                                {
                                    sugarQueryable1 = sugarQueryable1.Where(x => x.BatchNo.Equals(searchParameters.Value));
                                }
                            }
                            {
                                SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_StockInfoDetail.SupplyCode).FirstLetterToLower());
                                if (searchParameters != null)
                                {
                                    sugarQueryable1 = sugarQueryable1.Where(x => x.SupplyCode.Contains(searchParameters.Value));
                                }
                            }


 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -729,60 +729,62 @@
        {
            try
            {
              
           
                // èŽ·å–受影响的订单明细ID（去重）
                var affectedDetailIds = returnLocks
                    .Select(x => x.OrderDetailId)
                    .Distinct()
                    .ToList();
                //var affectedDetailIds = returnLocks
                //    .Select(x => x.OrderDetailId)
                //    .Distinct()
                //    .ToList();

                if (!affectedDetailIds.Any())
                {
                    _logger.LogInformation($"没有受影响的订单明细 - OrderNo: {orderNo}");
                    return;
                }
                //if (!affectedDetailIds.Any())
                //{
                //    _logger.LogInformation($"没有受影响的订单明细 - OrderNo: {orderNo}");
                //    return;
                //}

                _logger.LogInformation($"更新{affectedDetailIds.Count}个受影响的订单明细 - OrderNo: {orderNo}");
                //_logger.LogInformation($"更新{affectedDetailIds.Count}个受影响的订单明细 - OrderNo: {orderNo}");

                foreach (var detailId in affectedDetailIds)
                {
                    // é‡æ–°è®¡ç®—该订单明细的锁定数量
                    decimal currentLockQty = await CalculateOrderDetailLockQuantity(detailId);
                //foreach (var detailId in affectedDetailIds)
                //{
                //    // é‡æ–°è®¡ç®—该订单明细的锁定数量
                //    decimal currentLockQty = await CalculateOrderDetailLockQuantity(detailId);

                    // æ£€æŸ¥æ•°æ®ä¸€è‡´æ€§
                    if (currentLockQty < 0)
                    {
                        _logger.LogWarning($"锁定数量计算为负值 - OrderDetailId: {detailId}, å½“前值: {currentLockQty}，重置为0");
                        currentLockQty = 0;
                    }
                //    // æ£€æŸ¥æ•°æ®ä¸€è‡´æ€§
                //    if (currentLockQty < 0)
                //    {
                //        _logger.LogWarning($"锁定数量计算为负值 - OrderDetailId: {detailId}, å½“前值: {currentLockQty}，重置为0");
                //        currentLockQty = 0;
                //    }

                    // èŽ·å–订单明细
                    var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                        .FirstAsync(x => x.Id == detailId);
                //    // èŽ·å–订单明细
                //    var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                //        .FirstAsync(x => x.Id == detailId);

                    if (orderDetail == null)
                    {
                        _logger.LogWarning($"未找到订单明细 - OrderDetailId: {detailId}");
                        continue;
                    }
                //    if (orderDetail == null)
                //    {
                //        _logger.LogWarning($"未找到订单明细 - OrderDetailId: {detailId}");
                //        continue;
                //    }

                    // æ›´æ–°é”å®šæ•°é‡
                    if (orderDetail.LockQuantity != currentLockQty)
                    {
                        await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                            .SetColumns(it => new Dt_OutboundOrderDetail
                            {
                                LockQuantity = currentLockQty,
                            })
                            .Where(it => it.Id == detailId)
                            .ExecuteCommandAsync();
                //    // æ›´æ–°é”å®šæ•°é‡
                //    if (orderDetail.LockQuantity != currentLockQty)
                //    {
                //        await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
                //            .SetColumns(it => new Dt_OutboundOrderDetail
                //            {
                //                LockQuantity = currentLockQty,
                //            })
                //            .Where(it => it.Id == detailId)
                //            .ExecuteCommandAsync();

                        _logger.LogInformation($"更新订单明细锁定数量 - OrderDetailId: {detailId}, " +
                                              $"旧值: {orderDetail.LockQuantity}, æ–°å€¼: {currentLockQty}");
                    }
                //        _logger.LogInformation($"更新订单明细锁定数量 - OrderDetailId: {detailId}, " +
                //                              $"旧值: {orderDetail.LockQuantity}, æ–°å€¼: {currentLockQty}");
                //    }

                    // æ›´æ–°è®¢å•æ˜Žç»†çŠ¶æ€
                    await UpdateOrderDetailStatus(orderDetail);
                }
                //    // æ›´æ–°è®¢å•æ˜Žç»†çŠ¶æ€
                //    await UpdateOrderDetailStatus(orderDetail);
                //}
            }
            catch (Exception ex)
            {
@@ -931,6 +933,7 @@
                    {
                        hasInProgress = true;
                    }
                    await UpdateOrderDetailStatus(detail);
                }

                var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
@@ -968,6 +971,7 @@

                    _logger.LogInformation($"更新订单状态 - OrderNo: {orderNo}, æ—§çŠ¶æ€: {outboundOrder.OrderStatus}, æ–°çŠ¶æ€: {newStatus}");
                }
               
            }
            catch (Exception ex)
            {
@@ -1037,7 +1041,7 @@
                if (allCompleted && newStatus == (int)OutOrderStatusEnum.出库完成)
                {

                    if (outboundOrder.OrderType == OutOrderTypeEnum.Allocate.ObjToInt())
                    if (outboundOrder.OrderType == OutOrderTypeEnum.Allocate.ObjToInt() || outboundOrder.OrderType == OutOrderTypeEnum.InternalAllocat.ObjToInt())
                    {
                        var allocate = _allocateService.Repository.QueryData(x => x.UpperOrderNo == outboundOrder.UpperOrderNo).First();
                        var allocatefeedmodel = new AllocateDto