1

dengjunjie

2025-01-14 c9fc48e1d1c9d8e7828bbe045d23e2c7479e7613

1

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/basic/materielCodeInfo.js

@@ -30,19 +30,19 @@
    onInit() {  //框架初始化配置前，
      let materielCodeOption = this.getOption("materielCode");
      let purchaseOrderNoOption = this.getOption("purchaseOrderNo");
      materielCodeOption.onChange = (val, option) => {
        this.editFormFields.purchaseOrderNo = "";
        purchaseOrderNoOption.data = [];
      purchaseOrderNoOption.onChange = (val, option) => {
        this.editFormFields.materielCode = "";
        materielCodeOption.data = [];
        if (val == null || val == 0) {
          return this.$error("请选择物料编号！")
        }
        // console.log(val)
        // console.log(option)
        this.http.post("/api/PurchaseOrderDetail/GetPurchaseOrderInfo?materielCode=" + val, {}, true).then(
        this.http.post("/api/PurchaseOrder/GetPurchaseOrderInfo?purchaseOrderNo=" + val, {}, true).then(
          source => {
            if (!source.status) return this.$error(source.message);
            for (let i = 0; i < source.data.length; i++) {
              purchaseOrderNoOption.data.push({ key: i, value: source.data[i] })
              materielCodeOption.data.push({ key: i, value: source.data[i] })
            }
            // this.editFormFields.InputOder_itemname = source.data.itemName;
            // this.$success(source.data.itemName);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue

@@ -27,10 +27,19 @@
      sortName: "id",
    });
    const editFormFields = ref({
      purchaseOrderNo:""
      purchaseOrderNo:"",
      materielCode:"",
    });
    const editFormOptions = ref([
      [
        {
          title: "采购单号",
          field: "purchaseOrderNo",
          type:"select",
          dataKey: "purchaseOrderNos",
          data: [],
          required: true,
        },
        {
          title: "物料编码",
          field: "materielCode",
@@ -38,19 +47,11 @@
          dataKey: "MaterielCodes",
          data: [],
        },
        {
          title: "批次号",
          field: "lotNo",
          required: true,
        },
      ],
      [
        {
          title: "采购单号",
          field: "purchaseOrderNo",
          type:"select",
          // dataKey: "purchaseOrderNos",
          data: [],
          title: "批次号",
          field: "lotNo",
          required: true,
        },
        {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderDetailService.cs

@@ -12,6 +12,5 @@
{
    public interface IPurchaseOrderDetailService : IService<Dt_PurchaseOrderDetail>
    {
        WebResponseContent GetPurchaseOrderInfo(string materielCode);
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs

@@ -12,6 +12,7 @@
{
    public interface IPurchaseOrderService : IService<Dt_PurchaseOrder>
    {
        WebResponseContent GetPurchaseOrderInfo(string purchaseOrderNo);
        WebResponseContent ReceivePurchaseOrder(PurchaseOrderModel model);
    }
}

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

@@ -20,21 +20,5 @@
        public PurchaseOrderDetailService(IPurchaseOrderDetailRepository BaseDal) : base(BaseDal)
        {
        }

        public WebResponseContent GetPurchaseOrderInfo(string materielCode)
        {
            try
            {
                List<Dt_PurchaseOrderDetail> purchaseOrderDetails = BaseDal.QueryData(x => x.MaterielCode == materielCode);
                List<int> ids = purchaseOrderDetails.Select(x => x.PurchaseOrderId).ToList();
                List<Dt_PurchaseOrder> purchaseOrders = Db.Queryable<Dt_PurchaseOrder>().Where(x => ids.Contains(x.Id)).ToList();
                List<string> PurchaseOrderNos = purchaseOrders.Select(x => x.PurchaseOrderNo).ToList();
                return WebResponseContent.Instance.OK(data: PurchaseOrderNos);
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
    }
}

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

@@ -36,7 +36,19 @@
            _supplierInfoRepository = supplierInfoRepository;
            _materielInfoRepository = materielInfoRepository;
        }

        public WebResponseContent GetPurchaseOrderInfo(string purchaseOrderNo)
        {
            try
            {
                Dt_PurchaseOrder purchaseOrder = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == purchaseOrderNo).Includes(x => x.Details).First();
                List<string> MaterielCodes = purchaseOrder.Details.Where(x => x.PurchaseDetailStatus != PurchaseOrderDetailStatusEnum.Received.ObjToInt()).Select(x => x.MaterielCode).ToList();
                return WebResponseContent.Instance.OK(data: MaterielCodes);
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public WebResponseContent ReceivePurchaseOrder(PurchaseOrderModel model)
        {
            try
@@ -87,7 +99,7 @@
                    {
                        MaterielCode = item.MCode,
                        PurchaseDetailQuantity = item.Qty,
                        PurchaseDetailReceiveQty=0,
                        PurchaseDetailReceiveQty = 0,
                        PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.NotReceived.ObjToInt(),
                        Unit = item.Unit,
                        WarehouseId = warehouse.WarehouseId,

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs

@@ -1,5 +1,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_IInboundService;
using WIDESEA_Model.Models;
@@ -16,5 +18,10 @@
        public PurchaseOrderController(IPurchaseOrderService service) : base(service)
        {
        }
        [HttpPost, HttpGet, Route("GetPurchaseOrderInfo"), AllowAnonymous]
        public WebResponseContent GetPurchaseOrderInfo(string purchaseOrderNo)
        {
            return Service.GetPurchaseOrderInfo(purchaseOrderNo);
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs

@@ -18,10 +18,5 @@
        public PurchaseOrderDetailController(IPurchaseOrderDetailService service) : base(service)
        {
        }
        [HttpPost, HttpGet, Route("GetPurchaseOrderInfo"), AllowAnonymous]
        public WebResponseContent GetPurchaseOrderInfo(string materielCode)
        {
            return Service.GetPurchaseOrderInfo(materielCode);
        }
    }
}