WMS添加指定平库出库功能

dengjunjie

2025-01-12 c72afdd7ece074901405158fce8df69ee56cd36e

WMS添加指定平库出库功能

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue

@@ -10,7 +10,7 @@
      <div class="box-head">
        <el-alert :closable="false" style="width: 100%">
          <el-row>
            <el-col :span="20">
            <el-col :span="16">
              <span class="less-style">物料名称： {{ row.materielName }} </span>
              <el-divider direction="vertical"></el-divider>
              <span class="less-style">物料编号： {{ row.materielCode }} </span>
@@ -23,24 +23,29 @@
                >已选数量： {{ selectionSum }}
              </span>
            </el-col>
            <el-col :span="2">
            <el-col :span="8">
              <el-link
                type="primary"
                size="small"
                style="float: right; height: 20px"
                @click="getData(false)"
                >{{ kcname }}</el-link
              >
              <el-link
                type="primary"
                size="small"
                style="float: right; height: 20px; margin-right: 10px"
                @click="getData"
                >刷新</el-link
              ></el-col
            >
            <el-col :span="2">
              <el-link
                type="primary"
                size="small"
                style="float: right; height: 20px"
                style="float: right; height: 20px; margin-right: 10px"
                @click="revokeAssign"
                >撤销分配</el-link
              ></el-col
            >
            </el-col>
          </el-row>
        </el-alert>
      </div>
@@ -102,11 +107,14 @@
</template>
<script>
import VolBox from "@/components/basic/VolBox.vue";
import { fa } from "element-plus/es/locales.mjs";
export default {
  components: { VolBox },
  data() {
    return {
      row: null,
      kcname: "",
      pkcx: false,
      showDetialBox: false,
      tableData: [],
      tableColumns: [
@@ -182,12 +190,11 @@
      if(this.selection.length<=0){
        return this.$message.error("请勾选");
      }
      let url = this.pkcx
        ? "api/Task/GeneratePKOutboundTask?orderDetailId="
        : "api/Task/GenerateOutboundTask?orderDetailId=";
      this.http
        .post(
          "api/Task/GenerateOutboundTask?orderDetailId=" + this.row.id,
          this.selection,
          "数据处理中"
        )
        .post(url + this.row.id, this.selection, "数据处理中")
        .then((x) => {
          if (!x.status) return this.$message.error(x.message);
          this.$message.success("操作成功");
@@ -197,13 +204,15 @@
          });
        });
    },
    getData() {
    getData(a) {
      if (!a) this.pkcx = !this.pkcx;
      let url = this.pkcx
        ? "api/StockInfo/GetPKStockSelectViews?materielCode="
        : "api/StockInfo/GetStockSelectViews?materielCode=";
      this.kcname = this.pkcx ? "立库库存" : "平库库存";
      this.http
        .post(
          "api/StockInfo/GetStockSelectViews?materielCode=" +
            this.row.materielCode +
            "&orderId=" +
            this.row.orderId,
          url + this.row.materielCode + "&orderId=" + this.row.orderId,
          null,
          "查询中"
        )

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs

@@ -16,6 +16,7 @@
        IStockInfoRepository Repository { get; }

        List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode);
        List<StockSelectViewDTO> GetPKStockSelectViews(int orderId, string materielCode);

        List<Dt_StockInfo> GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, float needQuantity, out float residueQuantity);


 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs

@@ -218,5 +218,6 @@
        /// <param name="task"></param>
        /// <returns></returns>
        WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
        WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -119,11 +119,11 @@
                List<Dt_InboundOrder> dt_ReceiveOrders = new List<Dt_InboundOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InOrderStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderStatus < InOrderStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.InboundOrderNo.Contains(orderNo)) && x.OrderStatus < InOrderStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_InboundOrder>().Where(x => (x.InboundOrderNo.Contains(orderNo)) && x.OrderStatus < InOrderStatusEnum.入库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                }

                content.OK(data: dt_ReceiveOrders);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs

@@ -1,4 +1,5 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using MailKit.Search;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using System;
using System.Collections.Generic;
using System.Linq;

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs

@@ -82,11 +82,11 @@
                List<Dt_OutboundOrder> dt_ReceiveOrders = new List<Dt_OutboundOrder>();
                if (string.IsNullOrEmpty(orderNo))
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                }
                else
                {
                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).ToPageList(pageNo, 5);
                    dt_ReceiveOrders = Db.Queryable<Dt_OutboundOrder>().Where(x => (x.OrderNo.Contains(orderNo)) && x.OrderStatus < OutLockStockStatusEnum.出库完成.ObjToInt() && x.WarehouseId == warehouseId).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
                }

                content.OK(data: dt_ReceiveOrders);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -37,6 +37,12 @@
            _outboundRepository = outboundRepository;
        }

        /// <summary>
        /// æŸ¥è¯¢è®¢å•ç«‹åº“库存视图
        /// </summary>
        /// <param name="orderId"></param>
        /// <param name="materielCode"></param>
        /// <returns></returns>
        public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
        {
            try
@@ -71,6 +77,43 @@
            }

        }
        /// <summary>
        /// æŸ¥è¯¢è®¢å•å¹³åº“库存视图
        /// </summary>
        /// <param name="orderId"></param>
        /// <param name="materielCode"></param>
        /// <returns></returns>
        public List<StockSelectViewDTO> GetPKStockSelectViews(int orderId, string materielCode)
        {
            try
            {
                Dt_OutboundOrder outboundOrder = _outboundRepository.OutboundOrderRepository.QueryFirst(x => x.Id == orderId);
                if (outboundOrder == null)
                {
                    throw new Exception($"未找到出库单信息");
                }
                return BaseDal.QueryTabs<Dt_StockInfo, Dt_StockInfoDetail, StockSelectViewDTO>((a, b) => a.Id == b.StockId && a.WarehouseId == outboundOrder.WarehouseId, (a, b) => new StockSelectViewDTO
                {
                    LocationCode = a.LocationCode,
                    MaterielCode = b.MaterielCode,
                    MaterielName = b.MaterielName,
                    PalletCode = a.PalletCode,
                    UseableQuantity = b.StockQuantity - b.OutboundQuantity
                }, a => a.LocationCode == "平库位", b => b.StockQuantity > b.OutboundQuantity && b.MaterielCode == materielCode, x => true).GroupBy(x => x.PalletCode).Select(x => new StockSelectViewDTO
                {
                    LocationCode = x.FirstOrDefault()?.LocationCode ?? "",
                    MaterielCode = x.FirstOrDefault()?.MaterielCode ?? "",
                    MaterielName = x.FirstOrDefault()?.MaterielName ?? "",
                    PalletCode = x.Key,
                    UseableQuantity = x.Sum(x => x.UseableQuantity)
                }).ToList();
            }
            catch (Exception ex)
            {
                return null;
            }
        }

        public WebResponseContent StockQueryData(SaveModel saveModel)
        {
            try

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs

@@ -15,6 +15,8 @@
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
using MailKit.Search;
using WIDESEA_External.Model;

namespace WIDESEA_TaskInfoService
{
@@ -253,6 +255,152 @@
        }

        /// <summary>
        /// å¹³åº“直接出库
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        public WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
        {
            try
            {
                Dt_OutboundOrderDetail OrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);

                if (OrderDetail == null)
                {
                    throw new Exception("未找到出库单明细信息");
                }
                if (OrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
                    throw new Exception("出库单已完成");
                Dt_OutboundOrder outboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == OrderDetail.OrderId).Includes(x => x.Details).First();
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error($"未找到出库单信息");
                }
                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == outboundOrder.WarehouseId);
                List<Dt_StockInfo> outStocks = _stockService.StockInfoService.Repository.GetStockInfosByPalletCodes(stockSelectViews.Select(x => x.PalletCode).ToList());
                if (outStocks.Count < 1) return WebResponseContent.Instance.Error($"库存不足");
                List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
                List<Dt_StockInfo> upStocks = new List<Dt_StockInfo>();
                List<Dt_StockInfo> deStocks = new List<Dt_StockInfo>();
                List<Dt_StockInfoDetail> upstockDetails = new List<Dt_StockInfoDetail>();
                List<Dt_StockInfoDetail> destockDetails = new List<Dt_StockInfoDetail>();
                outStocks.ForEach(x =>
                {
                    x.Details.Where(x => x.MaterielCode == OrderDetail.MaterielCode).ToList().ForEach(v =>
                    {
                        float OriginalQuantity = v.StockQuantity;
                        float assignQuantity = 0;//分配数量
                        float assignAmount = OrderDetail.OrderQuantity - OrderDetail.OverOutQuantity;//待出数量
                        if (assignAmount > 0)
                        {
                            if (v.StockQuantity >= assignAmount)
                            {
                                assignQuantity = assignAmount;
                                v.StockQuantity -= assignAmount;
                                OrderDetail.OverOutQuantity += assignAmount;
                                OrderDetail.LockQuantity += assignAmount;
                                upstockDetails.Add(v);
                            }
                            else
                            {
                                assignQuantity = v.StockQuantity;
                                OrderDetail.OverOutQuantity += v.StockQuantity;
                                OrderDetail.LockQuantity += v.StockQuantity;
                                v.StockQuantity = 0;
                                destockDetails.Add(v);
                            }
                            Dt_OutStockLockInfo outStockLockInfo = new Dt_OutStockLockInfo()
                            {
                                PalletCode = x.PalletCode,
                                AssignQuantity = assignQuantity,
                                MaterielCode = OrderDetail.MaterielCode,
                                BatchNo = v.BatchNo,
                                LocationCode = x.LocationCode,
                                MaterielName = v.MaterielName,
                                OrderDetailId = OrderDetail.Id,
                                OrderNo = outboundOrder.OrderNo,
                                OrderType = outboundOrder.OrderType,
                                OriginalQuantity = OriginalQuantity,
                                Status = OutLockStockStatusEnum.出库完成.ObjToInt(),
                                StockId = x.Id,
                                TaskNum = 0,
                                OrderQuantity = OrderDetail.OrderQuantity,
                                Unit = OrderDetail.Unit
                            };
                            outStockLockInfos.Add(outStockLockInfo);
                        }
                    });
                    int overCount = x.Details.Where(x => x.StockQuantity == 0).Count();
                    if (overCount == x.Details.Count) deStocks.Add(x);
                    else upStocks.Add(x);
                });
                outboundOrder.OrderStatus = OutOrderStatusEnum.出库中.ObjToInt();
                OrderDetail.OrderDetailStatus = OrderDetail.OrderQuantity > OrderDetail.OverOutQuantity ? OrderDetailStatusEnum.AssignOverPartial.ObjToInt() : OrderDetailStatusEnum.Over.ObjToInt();
                if (OrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
                {
                    int overCount = outboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
                    if (outboundOrder.Details.Count - 1 == overCount)
                        outboundOrder.OrderStatus = OutOrderStatusEnum.出库完成.ObjToInt();
                }
                _unitOfWorkManage.BeginTran();
                _outboundService.OutboundStockLockInfoService.AddData(outStockLockInfos);
                _outboundService.OutboundOrderService.UpdateData(outboundOrder);
                _outboundService.OutboundOrderDetailService.UpdateData(OrderDetail);
                _stockRepository.StockInfoRepository.UpdateData(upStocks);
                _stockRepository.StockInfoRepository.DeleteData(deStocks);
                _stockRepository.StockInfoDetailRepository.UpdateData(upstockDetails);
                _stockRepository.StockInfoDetailRepository.DeleteData(destockDetails);
                _unitOfWorkManage.CommitTran();

                #region ä¸ŠæŠ¥ERP
                List<ERPPickModel> eRPPickModels = new List<ERPPickModel>();
                outStockLockInfos.ForEach(x =>
                {
                    ERPPickItemModel pickItemModel = new ERPPickItemModel()
                    {
                        Lotno = x.BatchNo,
                        Qty = x.AssignQuantity.ToString(),
                        Location = warehouse.WarehouseCode
                    };
                    ERPPickModel pickModel = new ERPPickModel()
                    {
                        Rowindex = OrderDetail.RowNo,
                        Material = OrderDetail.MaterielCode,
                        Qty = pickItemModel.Qty,
                        Dataitem = new List<ERPPickItemModel> { pickItemModel }
                    };
                    eRPPickModels.Add(pickModel);
                });
                ERPIssueItemModel issueItemModel = new ERPIssueItemModel()
                {
                    Pickcode = outboundOrder.UpperOrderNo,
                    PickList = eRPPickModels
                };
                ERPIssueModel issueModel = new ERPIssueModel()
                {
                    UniqueTag = outboundOrder.Id.ToString(),
                    Code = outboundOrder.OrderNo,
                    WarehouseCode = warehouse.WarehouseCode,
                    Docremark = "",
                    Deptno = outboundOrder.DepartmentCode,
                    Deptname = outboundOrder.DepartmentName,
                    Createtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                    Createuser = App.User.UserName,
                    Issitem = new List<ERPIssueItemModel>() { issueItemModel }
                };
                _invokeERPService.InvokeOutStandardsApi(issueModel);
                #endregion

                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务后数据更新到数据库
        /// </summary>
        /// <param name="tasks"></param>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs

@@ -22,11 +22,30 @@
        {
        }

        /// <summary>
        /// æŸ¥è¯¢è®¢å•ç«‹åº“库存视图
        /// </summary>
        /// <param name="orderId"></param>
        /// <param name="materielCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetStockSelectViews")]
        public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
        {
            return Service.GetStockSelectViews(orderId, materielCode);
        }

        /// <summary>
        /// æŸ¥è¯¢è®¢å•å¹³åº“库存视图
        /// </summary>
        /// <param name="orderId"></param>
        /// <param name="materielCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetPKStockSelectViews")]
        public List<StockSelectViewDTO> GetPKStockSelectViews(int orderId, string materielCode)
        {
            return Service.GetPKStockSelectViews(orderId, materielCode);
        }

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å’Œåº“区查询库存信息
        /// </summary>

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -109,6 +109,18 @@
        }

        /// <summary>
        /// å¹³åº“直接出库
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GeneratePKOutboundTask"), AllowAnonymous]
        public WebResponseContent GeneratePKOutboundTask(int orderDetailId, [FromBody] List<StockSelectViewDTO> stockSelectViews)
        {
            return Service.GeneratePKOutboundTask(orderDetailId, stockSelectViews);
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
        /// <param name="keys"></param>