库存操作，编辑物料信息

src/views/sto/components/PopupDistribution.vue

@@ -152,7 +152,7 @@
         show-overflow-tooltip
       >
         <template #default="{ row }">
-          {{ row.outQuantity ?? row.OUT_QUANTITY ?? '-' }}
+          {{ row.quantity ?? row.QUANTITY ?? '-' }}
         </template>
 				</el-table-column>
       <el-table-column
@@ -163,7 +163,7 @@
         show-overflow-tooltip
       >
         <template #default="{ row }">
-          {{ row.outWeight ?? row.OUT_WEIGHT ?? '-' }}
+          {{ row.weight ?? row.WEIGHT ?? '-' }}
         </template>
 				</el-table-column>
 			</el-table>
@@ -190,7 +190,7 @@ const form = ref({
 // 计算总重量和总数量
 const totalWeight = computed(() => {
   const total = tableData.value.reduce((sum, row) => {
-    const weight = parseFloat(row.outWeight ?? row.OUT_WEIGHT ?? 0) || 0
+    const weight = parseFloat(row.weight ?? row.WEIGHT ?? 0) || 0
     return sum + weight
   }, 0)
   return total.toFixed(3)
@@ -198,7 +198,7 @@ const totalWeight = computed(() => {
 
 const totalQuantity = computed(() => {
   const total = tableData.value.reduce((sum, row) => {
-    const quantity = parseFloat(row.outQuantity ?? row.OUT_QUANTITY ?? 0) || 0
+    const quantity = parseFloat(row.quantity ?? row.QUANTITY ?? 0) || 0
     return sum + quantity
   }, 0)
   return total.toFixed(0)

src/views/sto/components/PopupEdit.vue

@@ -16,19 +16,19 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="材料编号">
-            <el-input v-model="form.materialNo" disabled />
+            <el-input v-model="form.prodNo" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="规格型号">
-            <el-input v-model="form.materialStandard" disabled />
+            <el-input v-model="form.attrib03" disabled />
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="品名">
+          <el-form-item label="物料名称">
             <el-input v-model="form.materialName" disabled />
           </el-form-item>
         </el-col>
@@ -42,12 +42,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="数量">
-            <el-input v-model="form.outQuantity" />
+            <el-input v-model="form.quantity" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="重量">
-            <el-input v-model="form.outWeight" />
+            <el-input v-model="form.weight" />
           </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.orderNo" />
+            <el-input v-model="form.attrib01" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="合约号">
-            <el-input v-model="form.contractNo" />
+            <el-input v-model="form.attrib02" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -68,16 +68,15 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="捆包号">
-            <el-input v-model="form.bundleNo" />
+            <el-input v-model="form.attrib04" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产地">
-            <el-input v-model="form.prodPlace" />
+            <el-input v-model="form.attrib05" />
           </el-form-item>
         </el-col>
       </el-row>
-
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="货权单位">
@@ -128,7 +127,7 @@
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="备注">
-            <el-input v-model="form.remark" type="textarea" :rows="2" />
+            <el-input v-model="form.remark1" type="textarea" :rows="2" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -154,20 +153,22 @@ const customerCompanyOptions = ref([])
 const ownerCompanyOptions = ref([])
 
 const createEmptyForm = () => ({
+  id: '',
   materialNo: '',
-  materialStandard: '',
+  attrib03: '',
   materialName: '',
   stGrade: '',
-  outQuantity: '',
-  outWeight: '',
-  orderNo: '',
-  contractNo: '',
-  bundleNo: '',
+  quantity: '',
+  weight: '',
+  attrib01: '',
+  attrib02: '',
+  attrib04: '',
+  attrib05: '',
   prodPlace: '',
   ownerCompany: '',
   customerCompany: '',
   deliveryAddress: '',
-  remark: ''
+  remark1: ''
 })
 
 const form = reactive(createEmptyForm())
@@ -213,20 +214,22 @@ const open = (row) => {
   
   // 重置表单并回填当前行数据
   Object.assign(form, createEmptyForm(), {
-    materialNo: row.inProdNo ?? '',
-    materialStandard: row.materialStandard ?? '',
+    id: row.storeId ?? '',
+    prodNo: row.prodNo ?? '',
+    attrib03: row.attrib03 ?? '',
     materialName: row.materialName ?? '',
     stGrade: row.ST_GRADE ?? row.stGrade ?? '',
-    outQuantity: row.outQuantity ?? row.OUT_QUANTITY ?? '',
-    outWeight: row.outWeight ?? row.OUT_WEIGHT ?? '',
-    orderNo: row.orderNo ?? '',
-    contractNo: row.contractNo ?? '',
-    bundleNo: row.bundleNo ?? '',
+    quantity: row.quantity ?? row.QUANTITY ?? '',
+    weight: row.weight ?? row.WEIGHT ?? '',
+    attrib01: row.attrib01 ?? '',
+    attrib02: row.attrib02 ?? '',
+    attrib04: row.attrib04 ?? '',
+    attrib05: row.attrib05 ?? '',
     prodPlace: row.prodPlace ?? '',
     ownerCompany: row.ownerCompany ?? '',
     customerCompany: row.customerCompany ?? row.CustomerCompany ?? '',
     deliveryAddress: row.deliveryAddress ?? '',
-    remark: row.remark ?? ''
+    remark1: row.remark1 ?? ''
   })
   
   // 获取选项数据
@@ -245,10 +248,19 @@ const handleClose = () => {
 // 确定
 const handleConfirm = async () => {
   try {
+    // 构建保存参数，使用 id 而不是 storeId
+    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(form)
+      json: JSON.stringify(saveData)
     }
     
     const response = await proxy.$axios.post(url, param)

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.materialStandard" clearable placeholder="请输入规格型号" />
+              <el-input v-model="query.attrib03" clearable placeholder="请输入规格型号" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -52,12 +52,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="材料号">
-              <el-input v-model="query.inProdNo" clearable placeholder="请输入材料号" />
+              <el-input v-model="query.prodNo" clearable placeholder="请输入材料号" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="订单号">
-              <el-input v-model="query.orderNo" clearable placeholder="请输入订单号" />
+              <el-input v-model="query.attrib01" clearable placeholder="请输入订单号" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -65,9 +65,17 @@
         <el-row :gutter="10">
           <el-col :span="6">
             <el-form-item label="合约号">
-              <el-input v-model="query.contractNo" clearable placeholder="请输入合约号" />
+              <el-input v-model="query.attrib02" clearable placeholder="请输入合约号" />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="捆绑号">
+              <el-input v-model="query.attrib04" clearable placeholder="请输入捆绑号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
           <el-col :span="6">
             <el-form-item label="货权单位">
               <el-select
@@ -239,6 +247,11 @@
             {{ row.ST_GRADE ?? row.stGrade ?? '-' }}
           </template>
         </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 ?? '-' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="inDtm" label="入库时间" min-width="180" header-align="center" align="center" show-overflow-tooltip />
         <el-table-column prop="ownerCompany" label="货权公司" min-width="160" header-align="center" align="center" show-overflow-tooltip />
         <el-table-column prop="receivingCompany" label="收货公司" min-width="160" header-align="center" align="center" show-overflow-tooltip />
@@ -247,33 +260,36 @@
             {{ row.customerCompany ?? row.CustomerCompany ?? '-' }}
           </template>
         </el-table-column>
-        <el-table-column prop="inProdNo" label="材料号" min-width="140" header-align="center" align="center" show-overflow-tooltip />
-        <el-table-column label="出库车号" min-width="140" header-align="center" align="center" show-overflow-tooltip>
-          <template #default="{ row }">
-            {{ row.outTruckNo ?? row.carNo ?? '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="orderNo" label="订单号" min-width="160" header-align="center" align="center" show-overflow-tooltip />
-        <el-table-column prop="contractNo" 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>
+        <el-table-column prop="prodNo" label="材料号" min-width="140" header-align="center" align="center" show-overflow-tooltip />
+        <el-table-column label="入库车号" min-width="140" header-align="center" align="center" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ row.outWeight ?? row.OUT_WEIGHT ?? '-' }}
+            {{ row.inTruckNo ?? row.carNo ?? '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="出库数量" min-width="140" header-align="center" align="right" show-overflow-tooltip>
+        <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 label="重量" min-width="140" header-align="center" align="right" show-overflow-tooltip>
           <template #default="{ row }">
-            {{ row.outQuantity ?? row.OUT_QUANTITY ?? '-' }}
+            {{ row.weight ?? row.WEIGHT ?? '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="出库标记" width="140" header-align="center" align="center">
+        <el-table-column label="数量" min-width="140" header-align="center" align="right" show-overflow-tooltip>
           <template #default="{ row }">
-            <el-tag :type="flagTagType(row.outFlag)" effect="plain">
-              {{ flagLabel(row.outFlag) }}
-            </el-tag>
+            {{ row.quantity ?? row.QUANTITY ?? '-' }}
           </template>
         </el-table-column>
+<!--        <el-table-column label="出库标记" width="140" header-align="center" align="center">-->
+<!--          <template #default="{ row }">-->
+<!--            <el-tag :type="flagTagType(row.outFlag)" effect="plain">-->
+<!--              {{ flagLabel(row.outFlag) }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </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>
     </el-card>
 
@@ -378,10 +394,14 @@ const createDefaultQuery = () => {
   materialName: '',
     stGrade: '',
   materialStandard: '',
+    attrib03: '',
     bundleNo: '',
-    inProdNo: '',
-    orderNo: '',
-    contractNo: '',
+    prodNo: '',
+    attrib01: '',
+    attrib02: '',
+    attrib04: '',
+    attrib05: '',
+    remark1: '',
   ownerCompany: '',
     customerCompany: '',
     outTruckNo: '',
@@ -416,10 +436,12 @@ const buildQueryParams = () => {
     materialName: query.materialName,
     stGrade: query.stGrade,
     materialStandard: query.materialStandard,
+    attrib03: query.attrib03,
     bundleNo: query.bundleNo,
-    inProdNo: query.inProdNo,
-    orderNo: query.orderNo,
-    contractNo: query.contractNo,
+    prodNo: query.prodNo,
+    attrib01: query.attrib01,
+    attrib02: query.attrib02,
+    attrib04: query.attrib04,
     ownerCompany: query.ownerCompany,
     customerCompany: query.customerCompany,
     outTruckNo: query.outTruckNo,
@@ -638,7 +660,7 @@ const handleBatchMoveSuccess = () => {
 const executeCancelInbound = async () => {
   try {
     // 收集选中的行ID
-    const ids = multipleSelection.value.map(row => row.id || row.inProdNo).filter(id => id)
+    const ids = multipleSelection.value.map(row => row.id || row.prodNo).filter(id => id)
     
     if (ids.length === 0) {
       ElMessage.warning('选中的数据中没有有效的ID')
@@ -716,7 +738,7 @@ const handleLock = () => {
 const executeLock = async () => {
   try {
     // 收集选中的行ID
-    const ids = multipleSelection.value.map(row => row.id || row.inProdNo).filter(id => id)
+    const ids = multipleSelection.value.map(row => row.id || row.prodNo).filter(id => id)
     
     if (ids.length === 0) {
       ElMessage.warning('选中的数据中没有有效的ID')
@@ -777,7 +799,7 @@ const handleUnlock = () => {
 const executeUnlock = async () => {
   try {
     // 收集选中的行ID
-    const ids = multipleSelection.value.map(row => row.id || row.inProdNo).filter(id => id)
+    const ids = multipleSelection.value.map(row => row.id || row.prodNo).filter(id => id)
     
     if (ids.length === 0) {
       ElMessage.warning('选中的数据中没有有效的ID')
@@ -838,7 +860,7 @@ const handleInStock = () => {
 const executeInStock = async () => {
   try {
     // 收集选中的行ID
-    const ids = multipleSelection.value.map(row => row.id || row.inProdNo).filter(id => id)
+    const ids = multipleSelection.value.map(row => row.id || row.prodNo).filter(id => id)
     
     if (ids.length === 0) {
       ElMessage.warning('选中的数据中没有有效的ID')