Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-14 348ae52df14720b4447587d31d1edc4bb44dbed7

Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

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

@@ -14,8 +14,42 @@
  tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写)
  buttons: { view: [], box: [], detail: [] }, //扩展的按钮
  methods: {
    //获取表单配置
    getOption(field) {
      let option;
      this.editFormOptions.forEach(x => {
        x.forEach(item => {
          if (item.field == field) {
            option = item;
          }
        })
      })
      return option;
    },
    //下面这些方法可以保留也可以删除
    onInit() {  //框架初始化配置前，
      let materielCodeOption = this.getOption("materielCode");
      let purchaseOrderNoOption = this.getOption("purchaseOrderNo");
      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/PurchaseOrder/GetPurchaseOrderInfo?purchaseOrderNo=" + val, {}, true).then(
          source => {
            if (!source.status) return this.$error(source.message);
            for (let i = 0; i < source.data.length; i++) {
              materielCodeOption.data.push({ key: i, value: source.data[i] })
            }
            // this.editFormFields.InputOder_itemname = source.data.itemName;
            // this.$success(source.data.itemName);
            this.refresh();
          })
      }

      this.columns.push({
        field: '操作',
        title: '操作',

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

@@ -26,24 +26,32 @@
      url: "/MaterielCodeInfo/",
      sortName: "id",
    });
    const editFormFields = ref({});
    const editFormFields = ref({
      purchaseOrderNo:"",
      materielCode:"",
    });
    const editFormOptions = ref([
      [
        {
          title: "物料编码",
          field: "materielCode",
          required: true,
        },
        {
          title: "批次号",
          field: "lotNo",
          required: true,
        },
      ],
      [
        {
          title: "采购单号",
          field: "purchaseOrderNo",
          type:"select",
          dataKey: "purchaseOrderNos",
          data: [],
          required: true,
        },
        {
          title: "物料编码",
          field: "materielCode",
          type: "select",
          dataKey: "MaterielCodes",
          data: [],
        },
      ],
      [
        {
          title: "批次号",
          field: "lotNo",
          required: true,
        },
        {
@@ -56,13 +64,13 @@
        {
          title: "生产日期",
          field: "productionDate",
          type:"date",
          type: "date",
          required: true,
        },
        {
          title: "有效期",
          field: "effectiveDate",
          type:"date",
          type: "date",
          required: true,
        },
      ],
@@ -148,7 +156,7 @@
        title: "修改人",
        type: "string",
        width: 100,
        hidden:true,
        hidden: true,
        align: "left",
      },
      {
@@ -157,7 +165,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        hidden:true,
        hidden: true,
        sort: true,
      },
    ]);

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

@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_IInboundRepository;
using WIDESEA_Model.Models;
@@ -11,6 +12,5 @@
{
    public interface IPurchaseOrderDetailService : IService<Dt_PurchaseOrderDetail>
    {

    }
}

 ´úÂë¹ÜÀí/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

@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
@@ -12,7 +13,7 @@

namespace WIDESEA_InboundService
{
    public class PurchaseOrderDetailService : ServiceBase<Dt_PurchaseOrderDetail, IPurchaseOrderDetailRepository>,IPurchaseOrderDetailService
    public class PurchaseOrderDetailService : ServiceBase<Dt_PurchaseOrderDetail, IPurchaseOrderDetailRepository>, IPurchaseOrderDetailService
    {
        public IPurchaseOrderDetailRepository Repository => BaseDal;


 ´úÂë¹ÜÀí/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

@@ -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;