Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-CLI

src/api/delivery/index.ts

@@ -55,3 +55,11 @@ export function getMaterialDeliveryDetailList(params: any) {
     data: params,
   });
 }
+
+export function getDeliveryReceiveDetail(params: any) {
+  return request({
+    url: '/api/api/delivery/getDeliveryReceiveDetail',
+    method: 'post',
+    data: params,
+  });
+}

src/views/Query/StockQuery/Invoice/index.vue

@@ -10,7 +10,7 @@
                     <el-col :span="6">
                         <el-form-item label="组织" prop="ERPFACTORY">
                             <!-- <el-Input v-model="queryParams.ERPFACTORY" clearable /> -->
-                             <el-select v-model="queryParams.ERPFACTORY" placeholder="下拉选择" style="width: 160px">
+                             <el-select v-model="queryParams.ERPFACTORY" placeholder="下拉选择">
                                 <el-option v-for="item in state.formDataRefData" :key="item.ERPFACTORY" :label="item.DESCRIPTION"
                                     :value="item.ERPFACTORY" />
                             </el-select>
@@ -18,7 +18,7 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="单据类型" prop="SHIPREQUESTTYPE">
-                            <el-select v-model="queryParams.SHIPREQUESTTYPE" placeholder="下拉选择" style="width: 160px">
+                            <el-select v-model="queryParams.SHIPREQUESTTYPE" placeholder="下拉选择">
                                 <el-option v-for="item in state.documentType" :key="item.LABEL" :label="item.LABEL"
                                     :value="item.VALUE" />
                             </el-select>
@@ -36,7 +36,7 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="订单状态" prop="SHIPREQUESTSTATE">
-                            <el-select v-model="queryParams.SHIPREQUESTSTATE" placeholder="下拉选择" style="width: 160px">
+                            <el-select v-model="queryParams.SHIPREQUESTSTATE" placeholder="下拉选择">
                                 <el-option v-for="item in state.orderStatus" :key="item.LABEL" :label="item.LABEL"
                                     :value="item.VALUE" />
                             </el-select>
@@ -205,6 +205,7 @@ onMounted(() => {
     state.column = [
 
         { header: "组织", field: "ERPFACTORY", hide: false, width: 70 },
+        { header: "组织(CN)", field: "ORGNAME", hide: false, width: 80 },
         { header: "发货单", field: "SHIPREQUESTNAME", hide: false, width: 120 },
         { header: "单据类型", field: "SHIPREQUESTTYPE", hide: false, width: 100},
         { header: "单据状态", field: "SHIPREQUESTSTATE", hide: false, width: 100 },

src/views/Query/StockQuery/StockIn/index.vue

@@ -9,7 +9,7 @@
                 <el-row :gutter="24" class="form-row">
                     <el-col :span="6">
                         <el-form-item label="组织" prop="ERPFACTORY">
-                            <el-select v-model="queryParams.ERPFACTORY" placeholder="下拉选择" style="width: 160px">
+                            <el-select v-model="queryParams.ERPFACTORY" placeholder="下拉选择">
                                 <el-option v-for="item in state.formDataRefData" :key="item.ERPFACTORY" :label="item.DESCRIPTION"
                                     :value="item.ERPFACTORY" />
                             </el-select>
@@ -17,7 +17,7 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="单据类型" prop="RECEIVEREQUESTTYPE">
-                            <el-select v-model="queryParams.RECEIVEREQUESTTYPE" placeholder="下拉选择" style="width: 160px">
+                            <el-select v-model="queryParams.RECEIVEREQUESTTYPE" placeholder="下拉选择">
                                 <el-option v-for="item in state.documentType" :key="item.LABEL" :label="item.LABEL"
                                     :value="item.VALUE" />
                             </el-select>
@@ -30,7 +30,7 @@
                     </el-col>
                     <el-col :span="6">
                         <el-form-item label="订单状态" prop="RECEIVEREQUESTSTATE">
-                            <el-select v-model="queryParams.RECEIVEREQUESTSTATE" placeholder="下拉选择" style="width: 160px">
+                            <el-select v-model="queryParams.RECEIVEREQUESTSTATE" placeholder="下拉选择">
                                 <el-option v-for="item in state.orderStatus" :key="item.LABEL" :label="item.LABEL"
                                     :value="item.VALUE" />
                             </el-select>
@@ -66,10 +66,10 @@
                       </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row :gutter="24" style="margin-top: 10px;">
+                <el-row :gutter="24" class="form-row" style="margin-top: 10px;">
                     <el-col :span="6">
                       <el-form-item label="供应商编号" prop="SUPPLIERNO">
-                        <el-Input v-model="queryParams.SUPPLIERNO" clearable style="width: 240px"/>
+                        <el-Input v-model="queryParams.SUPPLIERNO" clearable/>
                       </el-form-item>
                     </el-col>
                 </el-row>
@@ -203,7 +203,7 @@ onMounted(() => {
     state.column = [
         { header: "组织", field: "ERPFACTORY", hide: false, width: 70 },
         { header: "组织(CN)", field: "ORGNAME", hide: false, width: 80 },
-        { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false, width: 100 },
+        { header: "订单编号", field: "RECEIVEREQUESTNAME", hide: false, width: 130 },
         { header: "料号", field: "MATERIALSPECNAME", hide: true },
         { header: "品名", field: "DESC_CN", hide: true },
         { header: "单据类型", field: "RECEIVEREQUESTTYPE", hide: false, width: 110 },

src/views/basics/flatWarehouse/materialInfo/index.vue

@@ -70,7 +70,7 @@
         v-loading="materialTableConfig.loading"
         :data="state.MaterialList"
         highlight-current-row
-        :height="tableHeight"
+        :height="250"
         row-key="id"
         @row-click="selectRow">
         <template v-for="(col, index) in materialTableConfig.column" :key="index">
@@ -235,7 +235,7 @@ const state = reactive({
     title: '新增用户',
     visible: false
   },
-  TEMPList: [{ label: '全部', value: '' },{ label: '是', value: '01' }, { label: '否', value: '02' }] as any,
+  TEMPList: [{ label: '全部', value: '' },{ label: '是', value: '02' }, { label: '否', value: '否' }] as any,
   formData: {
     total: 0,
     SUPPLIERNO: '',

src/views/stockIn/StockInByCharge/index.vue

@@ -49,7 +49,7 @@
         </el-table-column>
         <el-table-column prop="REQUESTQUANTITY" label="订单数量" width="100" />
         <el-table-column prop="RECEIVEDQUANTITY" label="已接收数量" width="100" />
-        <el-table-column prop="STOCKINQTY" label="已入库数量" width="100" />
+        <!-- <el-table-column prop="STOCKINQTY" label="已入库数量" width="100" /> -->
         <el-table-column prop="CREATEQTY" label="本次创建数量" width="100" />
         <el-table-column prop="MINUSQTY" label="剩余数量" width="100" />
         <el-table-column prop="DESC_CN" label="品名" width="280" />

src/views/stockIn/delivery/drawer.vue

@@ -109,7 +109,7 @@
 import { getCurrentInstance, onMounted, reactive, ref, toRefs } from 'vue'
 import { ElForm, ElMessageBox, ElTable } from 'element-plus'
 import { localStorage } from '@/utils/storage'
-import { createDelivery, getReceiveList, getReceiveDetail } from '@/api/delivery'
+import { createDelivery, getReceiveList, getReceiveDetail, getDeliveryReceiveDetail } from '@/api/delivery'
 import { getORG } from '@/api/auth'
 
 const queryFormRef = ref(ElForm)
@@ -203,7 +203,7 @@ const handleSelection = (val: any) => {
   let nameList: any = []
   val.forEach((item: any) => nameList.push(item.receiveRequestName))
   // 加载详情
-  getReceiveDetail({nameList: nameList}).then((res: any) => {
+  getDeliveryReceiveDetail({nameList: nameList}).then((res: any) => {
     state.receiveList = res.resultObj
     state.receiveLoading = false
   })

src/views/stockIn/deliveryStockIn/index.vue

@@ -196,7 +196,7 @@
 
 <script lang="ts">
 export default {
-  name: 'StockInByCharge'
+  name: 'deliveryStockIn'
 }
 </script>
 
@@ -659,6 +659,16 @@ function handleQuery() {
       // 加载库位
       if (res.resultObj.storeDetail && res.resultObj.storeDetail.length > 0) {
         getERPLocation(res.resultObj.storeDetail[0].ERPFACTORY)
+        // 处理 CREATEQTY 和 STOCKINQTY 为空的情况，设置默认值为 0
+        res.resultObj.storeDetail = res.resultObj.storeDetail.map((item: any) => ({
+          ...item,
+          CREATEQTY: item.CREATEQTY ?? 0,
+          STOCKINQTY: item.STOCKINQTY ?? 0,
+          MINUSQTY: item.MINUSQTY ?? 0,
+          REQUESTQUANTITY: item.REQUESTQUANTITY ?? 0,
+          RECEIVEDQUANTITY: item.RECEIVEDQUANTITY ?? 0,
+          RECEIVEDQUANTITY2: item.RECEIVEDQUANTITY2 ?? 0
+        }));
       }
       state.MATERIALPACKINGLIST = res.resultObj.storeCharge
       state.MATERIALRECEIVEACT = res.resultObj.storeDetail
@@ -717,6 +727,24 @@ async function sendToERP() {
       state.button_loading = false
       return
     }
+    //点击入库时创建数量必须等于订单数量
+    if (state.MATERIALRECEIVEACT == null || state.MATERIALRECEIVEACT.length < 1) {
+      ElMessageBox.alert('入库单详细信息不能为空', {
+        confirmButtonText: 'OK'
+      })
+    }else{
+      for (const element of state.MATERIALRECEIVEACT) {
+        if ( element.CREATEQTY !== element.REQUESTQUANTITY) {
+          ElMessageBox.alert('创建数量需等于订单数量', {
+            confirmButtonText: 'OK'
+          })
+          state.loadings = false
+          state.button_state = false
+          state.button_loading = false
+          return
+        }
+      }
+    }
     DeliveryStockInSendSAP({
       // materialreceiveAct: state.MATERIALPACKINGLIST[0],
       siteName: 'SDK',
@@ -728,7 +756,6 @@ async function sendToERP() {
       .then((res: any) => {
         console.log(res)
         if (res.success) {
-          ;(state.OpCode = ''),
             ElMessageBox.alert('入库成功', '提醒框', {
               confirmButtonText: 'OK'
             })
@@ -847,7 +874,7 @@ function getStorageSpec(value: any) {
 function getERPLocation(erpfactory: any) {
   getQueryList({
     queryId: 'GetERPLocationForCreatePO',
-    version: '00001',
+    version: '00002',
     params: {
       SITENAME: 'SDK',
       ERPFACTORYNAME: erpfactory //PO