库存操作，编辑物料信息

src/views/sto/components/PopupEdit.vue

@@ -21,7 +21,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="规格型号">
-            <el-input v-model="form.attrib03" disabled />
+            <el-input v-model="form.attrib_03" disabled />
           </el-form-item>
         </el-col>
       </el-row>
@@ -55,12 +55,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="订单号">
-            <el-input v-model="form.attrib01" />
+            <el-input v-model="form.attrib_01" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="合约号">
-            <el-input v-model="form.attrib02" />
+            <el-input v-model="form.attrib_02" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -68,12 +68,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="捆包号">
-            <el-input v-model="form.attrib04" />
+            <el-input v-model="form.attrib_04" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产地">
-            <el-input v-model="form.attrib05" />
+            <el-input v-model="form.attrib_05" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -127,7 +127,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注">
-            <el-input v-model="form.remark1" type="textarea" :rows="2" />
+            <el-input v-model="form.remark_1" type="textarea" :rows="2" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -155,20 +155,20 @@ const ownerCompanyOptions = ref([])
 const createEmptyForm = () => ({
   id: '',
   materialNo: '',
-  attrib03: '',
+  attrib_03: '',
   materialName: '',
   stGrade: '',
   quantity: '',
   weight: '',
-  attrib01: '',
-  attrib02: '',
-  attrib04: '',
-  attrib05: '',
+  attrib_01: '',
+  attrib_02: '',
+  attrib_04: '',
+  attrib_05: '',
   prodPlace: '',
   ownerCompany: '',
   customerCompany: '',
   deliveryAddress: '',
-  remark1: ''
+  remark_1: ''
 })
 
 const form = reactive(createEmptyForm())
@@ -216,20 +216,20 @@ const open = (row) => {
   Object.assign(form, createEmptyForm(), {
     id: row.storeId ?? '',
     prodNo: row.prodNo ?? '',
-    attrib03: row.attrib03 ?? '',
+    attrib_03: row.attrib_03 ?? '',
     materialName: row.materialName ?? '',
     stGrade: row.ST_GRADE ?? row.stGrade ?? '',
     quantity: row.quantity ?? row.QUANTITY ?? '',
     weight: row.weight ?? row.WEIGHT ?? '',
-    attrib01: row.attrib01 ?? '',
-    attrib02: row.attrib02 ?? '',
-    attrib04: row.attrib04 ?? '',
-    attrib05: row.attrib05 ?? '',
+    attrib_01: row.attrib_01 ?? '',
+    attrib_02: row.attrib_02 ?? '',
+    attrib_04: row.attrib_04 ?? '',
+    attrib_05: row.attrib_05 ?? '',
     prodPlace: row.prodPlace ?? '',
     ownerCompany: row.ownerCompany ?? '',
     customerCompany: row.customerCompany ?? row.CustomerCompany ?? '',
     deliveryAddress: row.deliveryAddress ?? '',
-    remark1: row.remark1 ?? ''
+    remark_1: row.remark_1 ?? ''
   })
   
   // 获取选项数据
@@ -248,23 +248,19 @@ const handleClose = () => {
 // 确定
 const handleConfirm = async () => {
   try {
-    // 构建保存参数，使用 id 而不是 storeId
+    // 构建保存参数，使用 id 作为后端主键
     const { storeId, ...saveData } = form
-    
-    // 确保使用 id 字段进行保存
+
     if (!saveData.id) {
       ElMessage.warning('缺少必要的数据ID')
       return
     }
-    
-    // TODO: 根据实际API调整接口地址和参数格式
-    const url = 'sto/OutRecord/update' // 需要根据实际API调整
-    const param = {
-      json: JSON.stringify(saveData)
-    }
-    
-    const response = await proxy.$axios.post(url, param)
-    
+
+    const url = 'sto/ProdMaster/edit'
+
+    // axios 封装第三个参数是 contentType 字符串，否则会被当作对象导致 Content-Type:[object Object]
+    const response = await proxy.$axios.post(url, saveData, 'application/json')
+
     if (response.data.code === 0 || response.data.code === '0') {
       ElMessage.success('修改成功')
       handleClose()

src/views/sto/ware/storeChange.vue

@@ -42,7 +42,7 @@
         <el-row :gutter="10">
           <el-col :span="6">
             <el-form-item label="规格型号">
-              <el-input v-model="query.attrib03" clearable placeholder="请输入规格型号" />
+              <el-input v-model="query.attrib_03" clearable placeholder="请输入规格型号" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -57,7 +57,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="订单号">
-              <el-input v-model="query.attrib01" clearable placeholder="请输入订单号" />
+              <el-input v-model="query.attrib_01" clearable placeholder="请输入订单号" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -65,12 +65,12 @@
         <el-row :gutter="10">
           <el-col :span="6">
             <el-form-item label="合约号">
-              <el-input v-model="query.attrib02" clearable placeholder="请输入合约号" />
+              <el-input v-model="query.attrib_02" clearable placeholder="请输入合约号" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="捆绑号">
-              <el-input v-model="query.attrib04" clearable placeholder="请输入捆绑号" />
+              <el-input v-model="query.attrib_04" clearable placeholder="请输入捆绑号" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -249,7 +249,7 @@
         </el-table-column>
         <el-table-column label="规格型号" min-width="160" header-align="center" align="center" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ row.attrib03 ?? row.materialStandard ?? '-' }}
+            {{ row.attrib_03 ?? row.materialStandard ?? '-' }}
           </template>
         </el-table-column>
         <el-table-column prop="inDtm" label="入库时间" min-width="180" header-align="center" align="center" show-overflow-tooltip />
@@ -266,10 +266,10 @@
             {{ row.inTruckNo ?? row.carNo ?? '-' }}
           </template>
         </el-table-column>
-        <el-table-column prop="attrib01" label="订单号" min-width="160" header-align="center" align="center" show-overflow-tooltip />
-        <el-table-column prop="attrib02" label="合约号" min-width="160" header-align="center" align="center" show-overflow-tooltip />
-        <el-table-column prop="attrib04" label="捆包号" min-width="160" header-align="center" align="center" show-overflow-tooltip />
-        <el-table-column prop="attrib05" label="产地" min-width="160" header-align="center" align="center" show-overflow-tooltip />
+        <el-table-column prop="attrib_01" label="订单号" min-width="160" header-align="center" align="center" show-overflow-tooltip />
+        <el-table-column prop="attrib_02" label="合约号" min-width="160" header-align="center" align="center" show-overflow-tooltip />
+        <el-table-column prop="attrib_04" label="捆包号" min-width="160" header-align="center" align="center" show-overflow-tooltip />
+        <el-table-column prop="attrib_05" label="产地" min-width="160" header-align="center" align="center" show-overflow-tooltip />
         <el-table-column label="重量" min-width="140" header-align="center" align="right" show-overflow-tooltip>
           <template #default="{ row }">
             {{ row.weight ?? row.WEIGHT ?? '-' }}
@@ -289,7 +289,7 @@
 <!--        </el-table-column>-->
         <el-table-column prop="deliveryAddress" label="收货地址" min-width="200" header-align="center" align="center" show-overflow-tooltip />
 <!--        <el-table-column prop="outDtm" label="出库时间" min-width="180" header-align="center" align="center" show-overflow-tooltip />-->
-        <el-table-column prop="remark1" label="备注" min-width="160" header-align="center" align="center" show-overflow-tooltip />
+        <el-table-column prop="remark_1" label="备注" min-width="160" header-align="center" align="center" show-overflow-tooltip />
       </el-table>
     </el-card>
 
@@ -394,14 +394,14 @@ const createDefaultQuery = () => {
   materialName: '',
     stGrade: '',
   materialStandard: '',
-    attrib03: '',
+    attrib_03: '',
     bundleNo: '',
     prodNo: '',
-    attrib01: '',
-    attrib02: '',
-    attrib04: '',
-    attrib05: '',
-    remark1: '',
+    attrib_01: '',
+    attrib_02: '',
+    attrib_04: '',
+    attrib_05: '',
+    remark_1: '',
   ownerCompany: '',
     customerCompany: '',
     outTruckNo: '',
@@ -436,12 +436,12 @@ const buildQueryParams = () => {
     materialName: query.materialName,
     stGrade: query.stGrade,
     materialStandard: query.materialStandard,
-    attrib03: query.attrib03,
+    attrib_03: query.attrib_03,
     bundleNo: query.bundleNo,
     prodNo: query.prodNo,
-    attrib01: query.attrib01,
-    attrib02: query.attrib02,
-    attrib04: query.attrib04,
+    attrib_01: query.attrib_01,
+    attrib_02: query.attrib_02,
+    attrib_04: query.attrib_04,
     ownerCompany: query.ownerCompany,
     customerCompany: query.customerCompany,
     outTruckNo: query.outTruckNo,