Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/tpluslasteststock/TplusLastestStockMapper.java

@@ -25,7 +25,7 @@ public interface TplusLastestStockMapper extends BaseMapperX<TplusLastestStockDO
 
         MPJLambdaWrapper<TplusLastestStockDO> query = new MPJLambdaWrapper<>();
 
-        query.distinct()
+        query.selectAll(TplusLastestStockDO.class)
                 .select("a.spec,a.unit")
                 .leftJoin(MaterialDO.class,"a",MaterialDO::getCode,TplusLastestStockDO::getInventoryCode)
                 .groupBy(MaterialDO::getCode)

mes-ui/mes-ui-admin-vue3/src/api/biz/storagelog/index.ts

@@ -80,3 +80,9 @@ export const getStorageWarnings = async () => {
 export const querystorageChanjet = async () => {
   return await request.get({ url: `/biz/chanjet/stock-latest/query` })
 }
+
+//查询用友入/出库实时分页
+export const getTplusLastestStorageNowPage = async (params) => {
+  return await request.get({ url: `/biz/tplus-lastest-stock/page`, params })
+}
+

mes-ui/mes-ui-admin-vue3/src/views/biz/storagelog/StorageLogForm.vue

@@ -1,66 +1,131 @@
 <template>
-<el-card class="hl-card" v-loading="fullscreenLoading">
-  <template #header>
-    <span>实时库存</span>
-  </template>
+  <el-card class="hl-card" v-loading="fullscreenLoading">
+    <template #header>
+      <span>实时库存</span>
+    </template>
     <ContentWrap class="borderxx">
-    <!-- 搜索工作栏 -->
-    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
-      <el-form-item label="物料编码" prop="matCode">
-        <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="matName">
-        <el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="物料类型" prop="matType">
-        <el-select v-model="queryParams.matType" placeholder="下拉选择" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)" :key="dict.label" :label="dict.label"
-            :value="dict.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="仓库" prop="whId">
-        <el-select v-model="queryParams.whId" placeholder="下拉选择" clearable class="!w-240px" @change="handleWh">
-          <el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name"
-            :value="dict.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item style="margin-left:15px">
-        <el-button @click="handleQuery" type="primary">
-          <Icon icon="ep:search" class="mr-5px" /> 搜索
-        </el-button>
-        <el-button @click="resetQuery">
-          <Icon icon="ep:refresh" class="mr-5px" /> 重置
-        </el-button>
-        <el-button
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="108px"
+      >
+        <el-form-item label="物料编码" prop="inventoryCode ">
+          <el-input
+            v-model="queryParams.inventoryCode"
+            placeholder="物料编码"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="inventoryName">
+          <el-input
+            v-model="queryParams.inventoryName"
+            placeholder="物料名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料类型" prop="inventoryClassCode">
+          <el-select
+            v-model="queryParams.inventoryClassCode"
+            placeholder="下拉选择"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)"
+              :key="dict.label"
+              :label="dict.label"
+              :value="dict.label"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库" prop="whId">
+          <el-select
+            v-model="queryParams.warehouseId"
+            placeholder="下拉选择"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in whList"
+              :key="dict.id"
+              :label="dict.wh_name"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item style="margin-left: 15px">
+          <el-button @click="handleQuery" type="primary">
+            <Icon icon="ep:search" class="mr-5px" /> 搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px" /> 重置
+          </el-button>
+          <el-button
             @click="getChanjet()"
             style="background-color: rgba(0, 0, 255, 1); color: #fff"
           >
             获取数据
           </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        class="hl-table"
+      >
         <el-table-column type="index" width="100" fixed label="序号" align="center" />
-      <el-table-column label="物料编码" align="center" prop="matCode" fixed min-width="120" />
-      <el-table-column label="物料名称" align="center" prop="matName" fixed min-width="120"/>
-      <el-table-column label="物料类型" align="center" prop="matType" min-width="120"/>
-      <el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/>
-      <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
-      <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
-      <el-table-column label="库存数量" align="center" prop="storageOkQty" min-width="120"/>
-      <el-table-column label="库存单位" align="center" prop="matUnit" min-width="120"/>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
-  </ContentWrap>
-</el-card>
+        <el-table-column
+          label="物料编码"
+          align="center"
+          prop="inventoryCode"
+          fixed
+          min-width="120"
+        />
+        <el-table-column
+          label="物料名称"
+          align="center"
+          prop="inventoryName"
+          fixed
+          min-width="120"
+        />
+        <el-table-column
+          label="物料类型"
+          align="center"
+          prop="inventoryClassCode"
+          min-width="120"
+        />
+        <!-- <el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/> -->
+        <el-table-column label="规格/型号" align="center" prop="spec" min-width="120" />
+        <el-table-column label="仓库" align="center" prop="warehouseName" min-width="120" />
+        <el-table-column label="库存数量" align="center" prop="availableQuantity" min-width="120">
+          <template #default="scope">
+            {{ parseFloat(scope.row.availableQuantity).toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="库存单位" align="center" prop="unit" min-width="120" />
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </el-card>
 </template>
 
 <script setup lang="ts">
@@ -87,12 +152,10 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  matCode: undefined,
-  matName: undefined,
-  matType: undefined,
-  lotNo: undefined,
-  whId: undefined,
-  headerNo: undefined,
+  inventoryCode: undefined,
+  inventoryName: undefined,
+  inventoryClassCode: undefined,
+  warehouseId: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -125,7 +188,7 @@ const getChanjet = async () => {
 const getList = async () => {
   loading.value = true
   try {
-    const data = await StorageLogApi.getStorageNowPage(queryParams)
+    const data = await StorageLogApi.getTplusLastestStorageNowPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -146,9 +209,9 @@ const resetQuery = () => {
 }
 
 //仓库列表
-const init_page_wh = (async ()=>{
+const init_page_wh = async () => {
   whList.value = await WarehouseApi.getSimpList()
-})
+}
 
 /** 初始化 **/
 onMounted(async () => {