From c17d401cd7aa87f9c1adc25733a74da6a8a210e7 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 19 三月 2026 17:00:13 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 58 ++++++++++++++++++++++++-----
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs | 4 ++
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrderDetail.cs | 12 +++--
3 files changed, 59 insertions(+), 15 deletions(-)
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 0cfb062..d872169 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"
@@ -26,21 +26,17 @@
orderStatus: "",
warehouseId: "",
supplierId: "",
+ createType: "",
+ isTestMaterials: "",
+ operator: "",
});
const editFormOptions = ref([
[
{
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
field: "inboundOrderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
+ readonly: true,
},
{
title: "涓婃父鍗曟嵁缂栧彿",
@@ -53,6 +49,29 @@
type: "textarea",
},
],
+ [
+ {
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
+ type: "select",
+ dataKey: "businessType",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鏄惁鍒嗘壒",
+ field: "isBatch",
+ type: "select",
+ dataKey: "enable",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鍘傚尯",
+ field: "factoryArea",
+ type: "string",
+ },
+ ]
]);
const searchFormFields = ref({
inboundOrderNo: "",
@@ -254,7 +273,8 @@
type: "string",
width: 150,
align: "left",
- bind: { key: "materielInfo", data: [] },
+ edit: { type: "" },
+ required: true,
},
{
field: "batchNo",
@@ -297,7 +317,7 @@
type: "decimal",
width: 90,
align: "left",
- required: true,
+ edit: { type: "" },
},
{
field: "orderQuantity",
@@ -309,6 +329,24 @@
required: true,
},
{
+ field: "barcodeQty",
+ title: "鏉＄爜鏁伴噺",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ edit: { type: "number" },
+ required: true,
+ },
+ {
+ field: "barcodeUnit",
+ title: "鏉＄爜鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "" },
+ required: true,
+ },
+ {
field: "receiptQuantity",
title: "缁勭洏鏁伴噺",
type: "int",
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_InboundService/InboundService.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_InboundService/InboundService.cs"
index e34d7b7..b564789 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_InboundService/InboundService.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_InboundService/InboundService.cs"
@@ -195,6 +195,10 @@
{
return content.Error($"璇ュ崟鎹负璇曚骇鐗╂枡锛岄渶瑕佸叆搴撳埌璇曚骇浠擄紝璇烽噸鏂版牴鎹巶鍖洪�夋嫨璇曚骇浠撳簱杩涜缁勭洏鍏ュ簱");
}
+ if (inboundOrder.IsTestMaterials == 0 && (palletDto.WarehouseType == "1076" || palletDto.WarehouseType == "5057"))
+ {
+ return content.Error($"璇ュ崟鎹负闈炶瘯浜х墿鏂欙紝涓嶈兘鍏ュ埌璇曚骇浠擄紝璇烽噸鏂版牴鎹粨搴撹繘琛岀粍鐩樺叆搴�");
+ }
if (!_locationInfoService.QueryLocationCount(Convert.ToInt32(palletDto.locationType)))
{
return content.Error($"璇ュ簱鍖簕palletDto.locationType}涓嶅瓨鍦ㄧ┖闂插簱浣�");
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_Model/Models/Inbound/Dt_InboundOrderDetail.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_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
index 7e79a58..7c05659 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_Model/Models/Inbound/Dt_InboundOrderDetail.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_Model/Models/Inbound/Dt_InboundOrderDetail.cs"
@@ -1,6 +1,7 @@
锘縰sing SqlSugar;
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -65,7 +66,7 @@
/// <summary>
/// 璁㈠崟鏄庣粏鐘舵��
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��", DefaultValue = "0")]
public int OrderDetailStatus { get; set; }
/// <summary>
@@ -77,14 +78,14 @@
/// <summary>
/// 鏀惰揣鍗曟槑缁嗚鍙�
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏀惰揣鍗曟槑缁嗚鍙�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏀惰揣鍗曟槑缁嗚鍙�", DefaultValue = "0")]
public int RowNo { get; set; }
/// <summary>
/// 琛屽彿
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿")]
+ [SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿", DefaultValue = "0")]
public string? lineNo { get; set; }
/// <summary>
@@ -98,7 +99,7 @@
/// 浠撳簱
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "浠撳簱")]
+ [SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "浠撳簱", DefaultValue = "")]
public string? WarehouseCode { get; set; }
/// <summary>
@@ -112,7 +113,7 @@
/// 澶栫鏉＄爜
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "outBoxbarcodes", ColumnDescription = "澶栫鏉＄爜")]
+ [SugarColumn(ColumnName = "outBoxbarcodes", ColumnDescription = "澶栫鏉＄爜", DefaultValue = "")]
public string? OutBoxbarcodes { get; set; }
/// <summary>
@@ -144,6 +145,7 @@
/// <summary>
/// 铏氭嫙鍑哄叆搴撴暟閲�
/// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "铏氭嫙鍑哄叆搴撴暟閲�")]
public decimal NoStockOutQty { get; set; }
/// <summary>
--
Gitblit v1.9.3