From c9fc48e1d1c9d8e7828bbe045d23e2c7479e7613 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 14 一月 2025 00:10:28 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs | 16 +++++++-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderDetailService.cs | 16 --------
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue | 23 ++++++-----
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs | 9 ++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs | 5 --
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderDetailService.cs | 1
代码管理/WMS/WIDESEA_WMSClient/src/extension/basic/materielCodeInfo.js | 10 ++--
8 files changed, 40 insertions(+), 41 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/materielCodeInfo.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/materielCodeInfo.js"
index 5ac3fc5..dc5728a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/basic/materielCodeInfo.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
index 06bdac5..ed96261 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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,
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderDetailService.cs"
index ea3d9ea..2abe5f2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderDetailService.cs"
@@ -12,6 +12,5 @@
{
public interface IPurchaseOrderDetailService : IService<Dt_PurchaseOrderDetail>
{
- WebResponseContent GetPurchaseOrderInfo(string materielCode);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs"
index 4fb1fff..fc2a5fd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderDetailService.cs"
index 6540ec2..a314b9b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
- }
- }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
index ce12b7c..1e593eb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
index cf735cb..b8bb804 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderController.cs"
@@ -1,5 +1,7 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing 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);
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs"
index bd09a5b..ee5c974 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/PurchaseOrderDetailController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
- }
}
}
--
Gitblit v1.9.3