From 8c5d68acc8c7ae8d04a0eae155db62f6562ce0be Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 27 十一月 2025 15:04:05 +0800
Subject: [PATCH] 代码提交
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs | 18 ++++++++++++++----
项目代码/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue | 2 +-
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 16 ++++++++--------
项目代码/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue | 2 +-
项目代码/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue | 6 +++---
5 files changed, 27 insertions(+), 17 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
index fc0542e..74bdf7a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
@@ -37,7 +37,7 @@
key: "id",
footer: "Foots",
cnName: "璋冩嫧鍗�",
- name: "Dt_AllocateOrder",
+ name: "AllocateOrder",
url: "/AllocateOrder/",
sortName: "id",
});
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
index 8fbef36..3acaf44 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
@@ -37,9 +37,9 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "璋冩嫧鍗�(鏅轰粨璋冨閮ㄤ粨搴�)",
- name: "inboundOrder",
- url: "/InboundOrder/",
+ cnName: "璋冩嫧鍗�(澶栭儴浠撹皟鍏ユ櫤浠�)",
+ name: "AllocateOrder",
+ url: "/AllocateOrder/",
sortName: "id",
});
const editFormFields = ref({
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 1b81cea..0fafa8b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -245,7 +245,7 @@
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "select",
- width: 150,
+ width: 120,
align: "left",
edit: { type: "" },
required: true,
@@ -254,7 +254,7 @@
field: "materielCode",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 100,
+ width: 120,
align: "left",
bind: { key: "MaterielNames", data: [] },
},
@@ -262,7 +262,7 @@
field: "batchNo",
title: "鎵规鍙�",
type: "decimal",
- width: 90,
+ width: 150,
align: "left",
edit: { type: "" },
required: true,
@@ -271,7 +271,7 @@
field: "supplyCode",
title: "渚涘簲鍟嗙紪鍙�",
type: "decimal",
- width: 90,
+ width: 100,
align: "left",
edit: { type: "" },
required: true,
@@ -288,7 +288,7 @@
field: "barcode",
title: "鏉＄爜",
type: "decimal",
- width: 90,
+ width: 180,
align: "left",
edit: { type: "" },
required: true,
@@ -306,21 +306,21 @@
field: "receiptQuantity",
title: "缁勭洏鏁伴噺",
type: "int",
- width: 120,
+ width: 90,
align: "left",
},
{
field: "overInQuantity",
title: "涓婃灦鏁伴噺",
type: "string",
- width: 200,
+ width: 90,
align: "left",
},
{
field: "orderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "string",
- width: 180,
+ width: 100,
align: "left",
bind: { key: "orderDetailStatusEnum", data: [] },
},
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
index 46ae5a5..555ac55 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/allocateoutboundOrder.vue"
@@ -38,7 +38,7 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "璋冩嫧鍗�(澶栭儴浠撳簱璋冩櫤浠�)",
+ cnName: "璋冩嫧鍗�(鏅轰粨璋冨嚭澶栭儴浠�)",
name: "outboundOrder",
url: "/OutboundOrder/",
sortName: "id",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
index 07ac628..5578ed4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Allocate/AllocateOrderController.cs"
@@ -1,5 +1,6 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using System.Data.Common;
using System.Diagnostics.Eventing.Reader;
using System.Threading.Tasks;
@@ -33,6 +34,7 @@
[HttpPost, Route("ReceiveAllocateOrder"), MethodParamsValidate, AllowAnonymous]
public async Task<WebResponseContent> ReceiveAllocateOrder([FromBody] AllocateDto model)
{
+ _logger.LogInformation("AllocateOrderController ReceiveAllocateOrder: " + JsonConvert.SerializeObject(model));
Dt_AllocateOrder allocateOrder = new Dt_AllocateOrder
{
OrderNo = model.OrderNo,
@@ -41,12 +43,20 @@
FactoryArea = model.FactoryArea,
IsBatch = model.IsBatch,
CreateType = model.OperationType,
- FromWarehouse=model.fromWarehouse,
- ToWarehouse=model.toWarehouse,
+ FromWarehouse = model.fromWarehouse,
+ ToWarehouse = model.toWarehouse,
Details = new List<Dt_AllocateOrderDetail>()
};
Enum.TryParse<BusinessTypeEnum>(allocateOrder.BusinessType, out var businessType);
-
+ //allocateOrder.OrderType = businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴� ? 215 : 115;
+ if (businessType == BusinessTypeEnum.鏅轰粨璋冨閮ㄤ粨搴�)
+ {
+ allocateOrder.OrderType = 115;
+ }
+ else if (businessType == BusinessTypeEnum.澶栭儴浠撳簱璋冩櫤浠�)
+ {
+ allocateOrder.OrderType = 215;
+ }
foreach (var detailDto in model.Details)
{
@@ -70,7 +80,7 @@
BatchNo = barcodeDto.BatchNo,
BarcodeQty = barcodeDto.Qty,
BarcodeUnit = barcodeDto.Unit,
- ValidDate=barcodeDto.validDate,
+ ValidDate = barcodeDto.validDate,
};
allocateOrder.Details.Add(orderDetail);
--
Gitblit v1.9.3