diff --git a/src/api/wms/allocateOrder/types.ts b/src/api/wms/allocateOrder/types.ts
index 5356fa9..745f7dc 100644
--- a/src/api/wms/allocateOrder/types.ts
+++ b/src/api/wms/allocateOrder/types.ts
@@ -76,6 +76,11 @@ export interface AllocateOrderVO {
*/
inMethod: string;
+ /**
+ * 调拨原因
+ */
+ allocateReason: string;
+
}
export interface AllocateOrderForm extends BaseEntity {
@@ -156,6 +161,11 @@ export interface AllocateOrderForm extends BaseEntity {
*/
inMethod?: string;
+ /**
+ * 调拨原因
+ */
+ allocateReason?: string;
+
}
export interface AllocateOrderQuery extends PageQuery {
@@ -237,6 +247,11 @@ export interface AllocateOrderQuery extends PageQuery {
*/
inMethod?: string;
+ /**
+ * 调拨原因
+ */
+ allocateReason?: string;
+
/**
* 日期范围参数
*/
diff --git a/src/api/wms/baseMaterialInfo/types.ts b/src/api/wms/baseMaterialInfo/types.ts
index 56a69cd..7c29d20 100644
--- a/src/api/wms/baseMaterialInfo/types.ts
+++ b/src/api/wms/baseMaterialInfo/types.ts
@@ -293,6 +293,17 @@ export interface BaseMaterialInfoVO {
*/
materialCategoryName: string;
+
+ /**
+ * 质检要求(0必检,1免检)
+ */
+ inspectionRequest: string;
+
+ /**
+ * 是否高价值物料(0否,1是)
+ */
+ isHighValue: string;
+
}
export interface BaseMaterialInfoForm extends BaseEntity {
@@ -550,6 +561,16 @@ export interface BaseMaterialInfoForm extends BaseEntity {
*/
materialCategoryName: string;
+ /**
+ * 质检要求(0必检,1免检)
+ */
+ inspectionRequest?: string;
+
+ /**
+ * 是否高价值物料(0否,1是)
+ */
+ isHighValue?: string;
+
}
export interface BaseMaterialInfoQuery extends PageQuery {
@@ -790,6 +811,17 @@ export interface BaseMaterialInfoQuery extends PageQuery {
*/
saleType?: string;
+ /**
+ * 质检要求(0必检,1免检)
+ */
+ inspectionRequest?: string;
+
+ /**
+ * 是否高价值物料(0否,1是)
+ */
+ isHighValue?: string;
+
+
/**
* 日期范围参数
*/
diff --git a/src/api/wms/instockOrder/types.ts b/src/api/wms/instockOrder/types.ts
index 46c932c..a9dea86 100644
--- a/src/api/wms/instockOrder/types.ts
+++ b/src/api/wms/instockOrder/types.ts
@@ -1,3 +1,5 @@
+import { InstockDetailForm } from '@/api/wms/instockDetail/types';
+
export interface InstockOrderVO {
/**
* 入库单 主键
@@ -116,6 +118,11 @@ export interface InstockOrderForm extends BaseEntity {
*/
instockMethond?: string;
+ /**
+ * 入库单子表（与后端 WmsInstockOrderBo.detailListBo 对齐）
+ */
+ detailListBo?: InstockDetailForm[];
+
}
export interface InstockOrderQuery extends PageQuery {
diff --git a/src/views/wms/baseMaterialInfo/index.vue b/src/views/wms/baseMaterialInfo/index.vue
index 47262e7..e1743af 100644
--- a/src/views/wms/baseMaterialInfo/index.vue
+++ b/src/views/wms/baseMaterialInfo/index.vue
@@ -83,7 +83,16 @@
{{ formatDayHourMinutes(scope.row.maxParkingTime) }}
-
+
+
+
+
+
+
+
+
+
+
@@ -198,6 +207,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -229,7 +265,11 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { apply_flag, inner_tube_flag,
always_flag, mes_accessories_flag,
auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
- material_classfication, mes_low_value_consumable_flag } = toRefs(proxy?.useDict('apply_flag', 'inner_tube_flag', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
+ material_classfication, mes_low_value_consumable_flag,
+ is_high_value,inspection_request
+} = toRefs(proxy?.useDict('apply_flag', 'inner_tube_flag', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag',
+ 'is_high_value', 'inspection_request'
+));
const baseMaterialInfoList = ref([]);
const buttonLoading = ref(false);
@@ -266,8 +306,10 @@ const columns = ref([
{ key: 5, label: `物料规格`, visible: true },
{ key: 6, label: `最小停放时间`, visible: false },
- { key: 7, label: `最大停放时间`, visible: false },
+ { key: 7, label: `最大停放时间`, visible: true },
{ key: 8, label: `备注`, visible: false },
+ { key: 9, label: `"是否高价值`, visible: true },
+ { key: 10, label: `质检要求`, visible: true },
]);
const initFormData: BaseMaterialInfoForm = {
@@ -329,6 +371,9 @@ const initFormData: BaseMaterialInfoForm = {
maxParkingHours:0,
maxParkingMinutes:0,
+ isHighValue: undefined,
+ inspectionRequest: undefined,
+
}
const data = reactive>({
form: {...initFormData},
@@ -384,6 +429,10 @@ const data = reactive>({
weightLowerLimit: undefined,
innerTubeFlag: undefined,
saleType: undefined,
+
+ isHighValue: undefined,
+ inspectionRequest: undefined,
+
params: {
approveDate: undefined,
}
diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index 0707085..33fe20a 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -426,7 +426,7 @@
-
+
-
+
{
// 新增提交
const dialogSubmit = () => {
+ // 将前端行映射为后端明细字段，并进行基本校验与过滤
+ const detailList = (dialogtable.value || [])
+ .map((item: any) => ({
+ materialId: item.materialId,
+ materialCode: item.materialCode,
+ materialName: item.materialName,
+ materialSpe: item.materialSpec, // 前端 materialSpec -> 后端 materialSpe
+ unitName: item.materialUnit, // 前端 materialUnit -> 后端 unitName
+ instockQty: item.instockQty,
+ codeYesNo: item.codeYesNo || '0',
+ materialCategoryId: dialogForm.value.materialCategoryId
+ }))
+ .filter(d => d.materialId && d.materialCode && Number(d.instockQty) > 0);
- addInstockOrder(dialogForm.value).then(e => {
- addInstockDetail(dialogtable.value.map(item => {
- return {...item, instockCode: e.data.instockCode,instockId: e.data.instockId, materialCategoryId: e.data.materialCategoryId}
- }
- )
- ).then(v => {
- dialogVisible.value = false
- getParentTable()
- })
+ if (!detailList.length) {
+ ElMessage.error('请添加至少一条入库明细且数量>0');
+ return;
+ }
- })
+ const payload: InstockOrderForm = {
+ ...dialogForm.value,
+ detailListBo: detailList
+ };
+
+ addInstockOrder(payload).then(() => {
+ ElMessage.success('保存成功');
+ dialogVisible.value = false;
+ getParentTable();
+ });
}
/**
* 入库单审批
@@ -1017,8 +1034,8 @@ const submitMaterialForm = () => {
dialogtable.value[currentRowIndex.value].materialId = selectedMaterial.value.materialId;
dialogtable.value[currentRowIndex.value].materialName = selectedMaterial.value.materialName;
dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode;
- dialogtable.value[currentRowIndex.value].materialUnit = selectedMaterial.value.materialUnit;
- dialogtable.value[currentRowIndex.value].materialSpec = selectedMaterial.value.materialSpec;
+ dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit;
+ dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec;
// 可以根据需要添加更多字段
}
}
diff --git a/src/views/wms/wmsPurchaseOrderCopy/index.vue b/src/views/wms/wmsPurchaseOrderCopy/index.vue
index b5b07de..2496cc1 100644
--- a/src/views/wms/wmsPurchaseOrderCopy/index.vue
+++ b/src/views/wms/wmsPurchaseOrderCopy/index.vue
@@ -853,8 +853,8 @@ const submitMaterialForm = () => {
dialogtable.value[currentRowIndex.value].materialId = selectedMaterial.value.materialId;
dialogtable.value[currentRowIndex.value].materialName = selectedMaterial.value.materialName;
dialogtable.value[currentRowIndex.value].materialCode = selectedMaterial.value.materialCode;
- dialogtable.value[currentRowIndex.value].materialUnit = selectedMaterial.value.materialUnit;
- dialogtable.value[currentRowIndex.value].materialSpec = selectedMaterial.value.materialSpec;
+ dialogtable.value[currentRowIndex.value].unitName = selectedMaterial.value.materialUnit;
+ dialogtable.value[currentRowIndex.value].materialSpe = selectedMaterial.value.materialSpec;
// 可以根据需要添加更多字段
}
}