From eb8fbf0c3736ef329f1844d7eb135a254740268b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 四月 2024 11:11:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue               |    2 
 north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue                                  |  173 ---------
 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java       |   14 
 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue                   |    2 
 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst   |   15 
 north-glass-erp/northglass-erp/src/components/BasicTable.vue                                       |  145 +++++++
 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue         |  104 ++++
 north-glass-erp/src/main/java/com/example/erp/entity/pp/OptimizeUse.java                           |   26 +
 north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original                                             |    0 
 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java                   |   11 
 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst |   15 
 north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java               |   29 +
 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java                         |   18 
 north-glass-erp/src/main/java/com/example/erp/tools/WebSocketServer.java                           |    2 
 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue                |    2 
 north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialOutboundDetail.java                |    1 
 north-glass-erp/target/classes/mapper/sd/OrderDetail.xml                                           |    7 
 north-glass-erp/.idea/dataSources.local.xml                                                        |    2 
 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue                 |  162 +++++---
 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue          |    2 
 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java             |   84 +++
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java                     |    2 
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml                                 |  149 +++++++
 north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml                                       |    7 
 north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml                                     |  149 +++++++
 25 files changed, 856 insertions(+), 267 deletions(-)

diff --git a/north-glass-erp/.idea/dataSources.local.xml b/north-glass-erp/.idea/dataSources.local.xml
index 3fa20a7..0c4acb4 100644
--- a/north-glass-erp/.idea/dataSources.local.xml
+++ b/north-glass-erp/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-232.9559.62">
+  <component name="dataSourceStorageLocal" created-in="IU-232.8660.185">
     <data-source name="@localhost [2]" uuid="165c5447-d19a-4aaf-af5f-cee92ae696c2">
       <database-info product="MySQL" version="8.0.22" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.22" exact-driver-version="8.0">
         <extra-name-characters>#@</extra-name-characters>
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
new file mode 100644
index 0000000..b77ee15
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -0,0 +1,145 @@
+<script setup>
+import {Search} from "@element-plus/icons-vue"
+import {reactive, ref} from "vue"
+const xGrid = ref()
+const gridOptions = reactive({
+  border:  "full",//琛ㄦ牸鍔犺竟妗�
+  keepSource: true,//淇濇寔婧愭暟鎹�
+  align: 'center',//鏂囧瓧灞呬腑
+  stripe:true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'OrderReport',
+  showFooter: true,//鏄剧ず鑴�
+  printConfig: {},
+  importConfig: {},
+  exportConfig: {},
+  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+  showOverflow:true,
+  columnConfig: {
+    resizable: true,
+    useKey: true
+  },
+  filterConfig: {   //绛涢�夐厤缃」
+    remote: true
+  },
+  customConfig: {
+    storage: true
+  },
+  editConfig: {
+    trigger: 'click',
+    mode: 'row',
+    showStatus: true
+  },//琛ㄥご鍙傛暟
+  columns:[
+    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+    {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
+    {field: '1',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '2',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '3',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '4',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '5',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '6',width:120, title: '浜у搧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '7',width:120, title: '浜у搧缂栫爜',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '8',width:120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '9',width:120, title: '璁㈠崟搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鍗婂緞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '瀹為檯闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '涓诲姞宸ヨ姹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鍟嗘爣閫夐」',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鍖呰鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '宸ヨ壓娴佺▼',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鍗曚环',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '閲戦',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '閾濇潯鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '涓氬姟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '閫佽揣鍦板潃',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鍒跺崟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '寤虹珛鏃堕棿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '鎬诲帤搴�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '浜у搧澶х被',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '浜у搧灏忕被',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'prodID',width:120, title: '瀹㈡埛鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+
+  ],//琛ㄥご鎸夐挳
+  toolbarConfig: {
+    buttons: [],
+    // import: false,
+    // export: true,
+    // print: true,
+    zoom: true,
+    custom: true
+  },
+  data:  [
+  ],//table body瀹為檯鏁版嵁
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        // if (props.tableProp.footList.includes(column.field)) {
+        //   return sumNum(data, column.field)
+        // }
+        return ''
+      })
+    ]
+  }
+
+})
+</script>
+
+<template>
+  <div class="main-div">
+    <el-date-picker
+        v-model="value1"
+        type="daterange"
+        start-placeholder="寮�濮嬫椂闂�"
+        end-placeholder="缁撴潫鏃堕棿"
+    />
+    <el-button style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
+    <div class="order-detail">
+      <vxe-grid
+          max-height="97%"
+          class="mytable-scrollbar"
+          ref="xGrid"
+          v-bind="gridOptions"
+      ></vxe-grid>
+
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.main-div {
+  width: 100%;
+  height: 100%;
+}
+.el-col{
+  border: #181818 1px solid;
+}
+:deep(.el-table .el-input__wrapper) {
+  box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
+  cursor: default;
+  border: none !important;
+  background-color: transparent;
+}
+.order-primary{
+  width: 100%;
+}
+.order-detail{
+  width: 100%;
+  height: 90%;
+
+}
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
index 3c643ca..c0910aa 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
@@ -232,7 +232,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
index 1076662..6aeb84f 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
@@ -72,10 +72,13 @@
   warehouseManager:userStore.user.userName
 })
 
-//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
 let filterData = ref({
 
 
+})
+
+let optimizeUse = ref({
+  id:0
 })
 
 let BasicData = ref([])
@@ -88,6 +91,7 @@
   {field: 'inventoryOrganization', width:'150', title: '搴撳瓨缁勭粐', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
   {field: 'materialCode', width: '150',title: '鐗╂枡缂栫爜', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'producer', width: '100',title: '浜у湴', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+  {field: 'projectNo', width: '100',title: '宸ョ▼鍙�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'inventoryQuantity',width: '100', title: '搴撳瓨鏁伴噺', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'availableQuantity', width: '100',title: '鍙敤搴撳瓨', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'outboundQuantity', width:'150', title: '鍑哄簱鏁伴噺', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
@@ -102,7 +106,9 @@
 request.get(`/BasicWarehouse/BasicWarehouseTypes/鏉愭枡鍑哄簱绫诲瀷`).then((res) => {
 
   if(res.code==200){
+
     titleSelectJson.value=deepClone(res.data)
+    console.log(titleSelectJson.value)
     const today = new Date
     today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
     titleUploadData.value.materialRequisitionDate = today.getFullYear() +
@@ -149,81 +155,121 @@
   addListener(xGrid.value,gridOptions,cellArea.value)
   //鍑哄簱鏂板
   const id = route.query.id
+  const type = route.query.type
   if (typeof id !== 'undefined' && id !== null && id !== '' && id !== '\n' && id !== '\r'){
-    filterData.value.stockId=id
-    number.value=id
-    console.log(filterData.value)
-    //绗竴娆¤皟鐢�
-    request.post("/MaterialInventory/getSelectMaterialInventory/1/100",filterData.value).then((res) => {
 
-      if(res.code==200){
+    if(type==='搴撳瓨'){
+      filterData.value.stockId=id
+      number.value=id
+      console.log(filterData.value)
+      request.post("/MaterialInventory/getSelectMaterialInventory/1/100",filterData.value).then((res) => {
 
-        console.log(res.data.data)
-        titleUploadData.value.warehouseManager=userStore.user.userName
-        titleUploadData.value.outboundType = titleSelectJson.value.outboundType[0].operateTypeName
-        materialStore.value=[]
-        for (let i=0;i<res.data.data.length;i++){
-          materialStore.value[i]=(res.data.data[i])
-          materialStore.value[i].json=(JSON.parse(res.data.data[i].json))
+        if(res.code==200){
 
+          console.log(res.data.data)
+          titleUploadData.value.warehouseManager=userStore.user.userName
+          titleUploadData.value.outboundType = titleSelectJson.value.outboundType[0].operateTypeName
+          materialStore.value=[]
+          for (let i=0;i<res.data.data.length;i++){
+            materialStore.value[i]=(res.data.data[i])
+            materialStore.value[i].json=(JSON.parse(res.data.data[i].json))
+
+          }
+
+          produceList = deepClone(materialStore.value)
+          xGrid.value.loadData(produceList)
+
+
+          //绂佺敤鎸夐挳
+          gridOptions.toolbarConfig.buttons[1].disabled  = true
+          gridOptions.toolbarConfig.buttons[2].disabled = true
+          //鏄剧ず澶嶉�夋
+          xGrid.value.showColumn("select")
+          gridOptions.loading=false
+        }else{
+          ElMessage.warning(res.msg)
         }
+      })
+    }else{
+      optimizeUse.value.rawStockCode=id
+      console.log(optimizeUse.value)
+      number.value=id
+      request.post("/MaterialInventory/getSelectMaterialInventoryEngineering/1/100",optimizeUse.value).then((res) => {
 
-        produceList = deepClone(materialStore.value)
-        xGrid.value.loadData(produceList)
+        if(res.code==200){
+
+          console.log(res.data.data)
+          titleUploadData.value.warehouseManager=userStore.user.userName
+          titleUploadData.value.outboundType = titleSelectJson.value.outboundType[0].operateTypeName
+          materialStore.value=[]
+          for (let i=0;i<res.data.data.length;i++){
+            materialStore.value[i]=(res.data.data[i])
+            materialStore.value[i].json=(JSON.parse(res.data.data[i].json))
+
+          }
+
+          produceList = deepClone(materialStore.value)
+          xGrid.value.loadData(produceList)
 
 
-        //绂佺敤鎸夐挳
-        gridOptions.toolbarConfig.buttons[1].disabled  = true
-        gridOptions.toolbarConfig.buttons[2].disabled = true
-        //鏄剧ず澶嶉�夋
-        xGrid.value.showColumn("select")
-        gridOptions.loading=false
-      }else{
-        ElMessage.warning(res.msg)
-      }
-    })
+          //绂佺敤鎸夐挳
+          gridOptions.toolbarConfig.buttons[1].disabled  = true
+          gridOptions.toolbarConfig.buttons[2].disabled = true
+          //鏄剧ず澶嶉�夋
+          xGrid.value.showColumn("select")
+          gridOptions.loading=false
+        }else{
+          ElMessage.warning(res.msg)
+        }
+      })
+    }
+
+
   }
 //鍑哄簱缂栬緫
   const str = route.query.materialOutboundId
 
   if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
-    filterData.value.materialOutboundId=str
-    console.log(filterData.value)
-    //绗竴娆¤皟鐢�
-    request.post("/MaterialInventory/getSelectMaterialOutbound/1/100",filterData.value).then((res) => {
 
-      if(res.code==200){
-        titleUploadData.value=deepClone(res.data.materialOutbound)
-        //鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
-        console.log(res.data.data)
-        if(titleUploadData.value.reviewedState!==0){
-          gridOptions.toolbarConfig.buttons[1].disabled = true
-          gridOptions.toolbarConfig.buttons[0].disabled = true
+      filterData.value.materialOutboundId=str
+      console.log(filterData.value)
+      //绗竴娆¤皟鐢�
+      request.post("/MaterialInventory/getSelectMaterialOutbound/1/100",filterData.value).then((res) => {
+
+        if(res.code==200){
+          titleUploadData.value=deepClone(res.data.materialOutbound)
+          //鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
+          console.log(res.data.data)
+          if(titleUploadData.value.reviewedState!==0){
+            gridOptions.toolbarConfig.buttons[1].disabled = true
+            gridOptions.toolbarConfig.buttons[0].disabled = true
 
 
+          }
+          if(titleUploadData.value.reviewedState===0){
+            gridOptions.toolbarConfig.buttons[2].disabled = true
+          }
+
+          materialStore.value=[]
+          for (let i=0;i<res.data.data.length;i++){
+            materialStore.value[i]=(res.data.data[i])
+            materialStore.value[i].json=(JSON.parse(res.data.data[i].json))
+
+          }
+          produceList = deepClone(materialStore.value)
+          xGrid.value.loadData(produceList)
+          //闅愯棌澶嶉�夋
+          /*xGrid.value.hideColumn("select")
+          gridOptions.loading=false*/
+          xGrid.value.showColumn("select")
+          gridOptions.loading=false
+
+        }else{
+          ElMessage.warning(res.msg)
         }
-        if(titleUploadData.value.reviewedState===0){
-          gridOptions.toolbarConfig.buttons[2].disabled = true
-        }
+      })
 
-        materialStore.value=[]
-        for (let i=0;i<res.data.data.length;i++){
-          materialStore.value[i]=(res.data.data[i])
-          materialStore.value[i].json=(JSON.parse(res.data.data[i].json))
 
-        }
-        produceList = deepClone(materialStore.value)
-        xGrid.value.loadData(produceList)
-        //闅愯棌澶嶉�夋
-        /*xGrid.value.hideColumn("select")
-        gridOptions.loading=false*/
-        xGrid.value.showColumn("select")
-        gridOptions.loading=false
-
-      }else{
-        ElMessage.warning(res.msg)
-      }
-    })
   }
 
 
@@ -375,7 +421,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
index 5fb42f1..b2e9273 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
@@ -170,7 +170,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
index cfae732..db3a33a 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
@@ -177,7 +177,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
index 08f3220..8649d29 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
@@ -432,7 +432,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'OrderList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
index 3ae8d0a..ec7c25a 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue
@@ -59,6 +59,18 @@
 
 })
 
+const values = ref('')
+const selectOptions = [
+  {
+    value: '搴撳瓨',
+    label: '搴撳瓨'
+  },
+  {
+    value: '宸ョ▼',
+    label: '宸ョ▼',
+  }
+]
+
 let selectDate = ref(["",""])
 let BasicData = ref([])
 let materialStore= ref([])
@@ -72,6 +84,7 @@
   {field: 'materialCode', width: '150',title: '鐗╂枡缂栫爜', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'producer', width: '100',title: '浜у湴', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'id',width: '100', title: '搴撳瓨缂栧彿', sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+  {field: 'projectNo',width: '100', title: '宸ョ▼鍙�', sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   //{field: 'safetyStock', width: '100',title: '瀹夊叏搴撳瓨', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'inventoryQuantity',width: '100', title: '搴撳瓨鏁伴噺', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
   {field: 'availableQuantity', width: '100',title: '鍙敤搴撳瓨', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
@@ -100,6 +113,7 @@
       gridOptions.columns.push(aa)
 
     }
+    values.value='搴撳瓨'
     getInventoryWorks()
 
   }else{
@@ -110,6 +124,7 @@
 
 
 const getInventoryWorks = () => {
+
   request.post(`/MaterialInventory/getSelectMaterialInventoryDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
 
     if(res.code==200){
@@ -161,6 +176,43 @@
   })
 }
 
+const selectInventoryWork = () => {
+  if(values.value==='搴撳瓨'){
+    getInventoryWorks()
+  }else{
+    getInventoryEngineeringWork()
+  }
+}
+
+const getInventoryEngineeringWork = () => {
+
+    request.post(`/MaterialInventory/getSelectMaterialInventoryEngineeringDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+      if(res.code==200){
+        console.log(res.data)
+        materialStore.value=[]
+        for (let i=0;i<res.data.data.length;i++){
+          materialStore.value[i]=(res.data.data[i])
+          materialStore.value[i].json=(JSON.parse(res.data.data[i].json))
+
+        }
+
+        total.dataTotal = res.data.total.total*1
+        total.pageTotal= res.data.total.pageTotal
+        pageNum.value=1
+        selectDate.value = res.data.selectDate
+        produceList = deepClone(materialStore.value)
+        xGrid.value.loadData(produceList)
+        gridOptions.loading=false
+      }else{
+        ElMessage.warning(res.msg)
+        router.push("/login")
+      }
+    })
+
+
+}
+
 
 
 const selectOrderList = ()=>{
@@ -176,7 +228,11 @@
         gridOptions.columns.push(aa)
 
       }
-      getInventoryWorkPaging()
+      if(values.value==='搴撳瓨'){
+        getInventoryWorkPaging()
+      }else{
+        getInventoryEngineeringWork()
+      }
 
     }else{
       ElMessage.warning(res.msg)
@@ -204,7 +260,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
@@ -271,18 +327,33 @@
             ElMessage.warning(t('productStock.unselectedData'))
             return
           }
+          console.log(selectRecords)
           let id = ""
           const array = [];
-          for (let i = 0; i < selectRecords.length; i++) {
-            array.push(selectRecords[i].id)
-            if (i + 1 === selectRecords.length) {
-              id += selectRecords[i].id
-            } else {
-              id += selectRecords[i].id + "|"
+          if (values.value==='搴撳瓨'){
+            for (let i = 0; i < selectRecords.length; i++) {
+              array.push(selectRecords[i].id)
+              if (i + 1 === selectRecords.length) {
+                id += selectRecords[i].id
+              } else {
+                id += selectRecords[i].id + "|"
+              }
+            }
+          }else{
+            for (let i = 0; i < selectRecords.length; i++) {
+              array.push(selectRecords[i].useId)
+              if (i + 1 === selectRecords.length) {
+                id += selectRecords[i].useId
+              } else {
+                id += selectRecords[i].useId + "|"
+              }
             }
           }
 
-          router.push({path: '/main/ingredientsStock/CreateOutbound', query: {id: id}})
+
+
+
+          router.push({path: '/main/ingredientsStock/CreateOutbound', query: {id: id,type:values.value}})
           break
 
 
@@ -374,7 +445,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
@@ -560,7 +631,18 @@
 
     />
     <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
-
+    <div>
+      <el-row>
+        <el-select v-model="values" placeholder="璇烽�夋嫨绫诲埆" @change="selectInventoryWork">
+          <el-option
+              v-for="item in selectOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-row>
+    </div>
 
     <vxe-grid
         max-height="100%"
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
index 51c8978..73b4227 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/OrderReport.vue
@@ -1,179 +1,10 @@
 <script setup>
-
-import {Folder, Search} from "@element-plus/icons-vue";
-import BasicTable from "@/components/basic/BasicTable.vue";
-import {reactive} from "vue";
-
-const gridOptions = reactive({
-  border:  "full",//琛ㄦ牸鍔犺竟妗�
-  keepSource: true,//淇濇寔婧愭暟鎹�
-  align: 'center',//鏂囧瓧灞呬腑
-  stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'OrderReport',
-  showFooter: true,//鏄剧ず鑴�
-  printConfig: {},
-  importConfig: {},
-  exportConfig: {},
-  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
-  showOverflow:true,
-  columnConfig: {
-    resizable: true,
-    useKey: true
-  },
-  filterConfig: {   //绛涢�夐厤缃」
-    remote: true
-  },
-  customConfig: {
-    storage: true
-  },
-  editConfig: {
-    trigger: 'click',
-    mode: 'row',
-    showStatus: true
-  },//琛ㄥご鍙傛暟
-  columns:[
-    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-    {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
-    {field: '1',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '2',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '3',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '4',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '5',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '6',width:120, title: '浜у搧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '7',width:120, title: '浜у搧缂栫爜',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '8',width:120, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: '9',width:120, title: '璁㈠崟搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鍗婂緞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '瀹為檯闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '涓诲姞宸ヨ姹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鍟嗘爣閫夐」',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鍖呰鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '宸ヨ壓娴佺▼',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鍗曚环',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '閲戦',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '閾濇潯鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '涓氬姟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '閫佽揣鍦板潃',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鍒跺崟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '寤虹珛鏃堕棿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '鎬诲帤搴�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '浜у搧澶х被',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '浜у搧灏忕被',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'prodID',width:120, title: '瀹㈡埛鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
-
-  ],//琛ㄥご鎸夐挳
-  toolbarConfig: {
-    buttons: [],
-    import: false,
-    export: true,
-    print: true,
-    zoom: true,
-    custom: true
-  },
-  data:  [
-  ],//table body瀹為檯鏁版嵁
-  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
-    return[
-      columns.map((column, columnIndex) => {
-        if (columnIndex === 0) {
-          return '鍚堣:'
-        }
-        // if (props.tableProp.footList.includes(column.field)) {
-        //   return sumNum(data, column.field)
-        // }
-        return ''
-      })
-    ]
-  }
-
-})
-
-
-
-
-
-
-
-
+import BasicTable from "@/components/BasicTable.vue"
 </script>
 
 <template>
-  <div class="main-div">
-    <el-date-picker
-        v-model="value1"
-        type="daterange"
-        start-placeholder="寮�濮嬫椂闂�"
-        end-placeholder="缁撴潫鏃堕棿"
-    />
-    <el-button style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
-    <div class="order-detail">
-      <vxe-grid
-          max-height="97%"
-          class="mytable-scrollbar"
-          ref="xGrid"
-          v-bind="gridOptions"
-      ></vxe-grid>
-<!--      <el-table
-          :data="dataList"
-          :header-cell-style="{ 'text-align': 'center' }"
-          :cell-style="{ 'text-align': 'center' }"
-          border
-      >
-
-        <el-table-column type="expand" fixed>
-          <template #default="props" >
-            <div m="4">
-              <p m="t-0 b-2">: {{ props.row['2'] }}</p>
-            </div>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column
-            :prop="index.toString()"
-            :show-overflow-tooltip='true'
-            width="100" v-for="(item,index) in titleList"
-            :label="item"    />
-      </el-table>-->
-    </div>
-  </div>
+  <basic-table/>
 </template>
 
 <style scoped>
-.main-div {
-  width: 100%;
-  height: 100%;
-}
-.el-col{
-  border: #181818 1px solid;
-}
-:deep(.el-table .el-input__wrapper) {
-  box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
-  cursor: default;
-  border: none !important;
-  background-color: transparent;
-}
-.order-primary{
-  width: 100%;
-}
-.order-detail{
-  width: 100%;
-  height: 90%;
-
-}
-
-
-
 </style>
\ No newline at end of file
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
index 711ffaa..bc35d70 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
@@ -4,6 +4,7 @@
 import com.example.erp.common.Constants;
 import com.example.erp.common.Result;
 import com.example.erp.entity.mm.*;
+import com.example.erp.entity.pp.OptimizeUse;
 import com.example.erp.exception.ServiceException;
 import com.example.erp.service.mm.MaterialInventoryService;
 import com.example.erp.service.mm.MaterialStoreService;
@@ -50,10 +51,22 @@
         return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
     }
 
+    @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鍔犳椂闂存煡璇㈡帴鍙�")
+    @PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}")
+    public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
+        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
+    }
+
     @ApiOperation("鐗╂枡搴撳瓨鏌ヨ鎺ュ彛")
     @PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
     public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
         return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
+    }
+
+    @ApiOperation("鐗╂枡搴撳瓨宸ョ▼鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
+    public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
+        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
     }
 
     @ApiOperation("鏉愭枡鍑哄簱鏌ヨ鎺ュ彛")
@@ -68,6 +81,7 @@
         return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
     }
 
+
     @ApiOperation("鏉愭枡鍑哄簱瀹℃牳鎺ュ彛")
     @PostMapping("/updateMaterialOutboundToExamine")
     public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index df74ba9..23f9db5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -3,6 +3,7 @@
 import com.example.erp.common.Constants;
 import com.example.erp.common.Result;
 import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderDetail;
 import com.example.erp.entity.sd.OrderGlassDetail;
 import com.example.erp.exception.ServiceException;
 import com.example.erp.service.sd.OrderService;
@@ -79,4 +80,14 @@
     public Result updateOrderMoney(@RequestBody Map<String,Object> map)  {
         return  Result.seccess(orderService.updateOrderMoney(map));
     }
+
+    @ApiOperation("鏌ヨ璁㈠崟鎶ヨ〃")
+    @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}")
+    public Result getOrderReport(@PathVariable Integer pageNum,
+                                 @PathVariable Integer pageSize,
+                                 @PathVariable List<String> selectDate,
+                                 @RequestBody OrderDetail orderDetail)  {
+        return  Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));
+
+    }
 }
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialOutboundDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialOutboundDetail.java
index 748048d..0b7132d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialOutboundDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialOutboundDetail.java
@@ -17,6 +17,7 @@
     private String inventoryOrganization;
     private String materialName;
     private String materialCode;
+    private Integer useId;
     private String producer;
     private Double width;
     private Double height;
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/OptimizeUse.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/OptimizeUse.java
new file mode 100644
index 0000000..2ff87f1
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/OptimizeUse.java
@@ -0,0 +1,26 @@
+package com.example.erp.entity.pp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+@TableName("pp.`optimize_use`")
+public class OptimizeUse {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    private Integer projectNo;
+    private String rawStockCode;
+    private String stockCode;
+    private Integer type;
+    private Double width;
+    private Double height;
+    private Integer useCount;
+    private Integer notUseCount;
+    private LocalDate createTime;
+
+
+}
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
index 625d8d2..db4977a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java
@@ -1,6 +1,7 @@
 package com.example.erp.mapper.mm;
 
 import com.example.erp.entity.mm.*;
+import com.example.erp.entity.pp.OptimizeUse;
 import com.example.erp.entity.sd.Delivery;
 import com.example.erp.entity.sd.DeliveryDetail;
 import com.example.erp.entity.sd.OrderDetail;
@@ -22,12 +23,29 @@
 
     Map<String,Integer> getSelectMaterialInventoryDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate, MaterialInventory materialInventory);
 
+    List<Map<String,Object>> getSelectMaterialInventoryEngineeringDate(@Param("offset") Integer offset,
+                                                            @Param("pageSize") Integer pageSize,String startDate, String endDate,
+                                                            @Param("materialInventory") MaterialInventory materialInventory);
+
+
+    Map<String,Integer> getSelectMaterialInventoryEngineeringDatePageTotal(Integer offset, Integer pageSize,String startDate, String endDate, MaterialInventory materialInventory);
+
+
+
+
     List<Map<String,Object>> getSelectMaterialInventory(@Param("offset") Integer offset,
                                                        @Param("pageSize") Integer pageSize,
                                                        @Param("materialInventory") MaterialInventory materialInventory);
 
 
     Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory);
+
+    List<Map<String,Object>> getSelectMaterialInventoryEngineering(@Param("offset") Integer offset,
+                                                        @Param("pageSize") Integer pageSize,
+                                                        @Param("optimizeUse") OptimizeUse optimizeUse);
+
+
+    Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse);
 
     Boolean insertMaterialStore(@Param("type") String type,
                                          @Param("json") String json);
@@ -75,6 +93,10 @@
     Boolean updateReturningWarehouseDetail(@Param("number") String number, @Param("returningWarehouseNumber") Integer returningWarehouseNumber,
                                            @Param("materialInventoryId") Long materialInventoryId);
 
+    Boolean updateMaterialInventoryAvailableOptOut(@Param("useId") Integer useId,
+                                                @Param("quantity") Integer quantity);
+    Boolean updateMaterialInventoryAvailableOptInt(@Param("useId") Integer useId,
+                                                @Param("quantity") Integer quantity);
 
     Boolean updateMaterialInventoryAvailableOut(@Param("inventoryId") Long inventoryId,
                                                 @Param("quantity") Integer quantity);
@@ -112,10 +134,17 @@
                                                          @Param("pageSize") Integer pageSize,
                                                          @Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
 
+    List<MaterialOutboundDetail> SelectMaterialOutboundDetail(@Param("offset") Integer offset,
+                                                             @Param("pageSize") Integer pageSize,
+                                                             @Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
     List<Map<String,Object>> getSelectMaterialOutboundDetail(@Param("offset") Integer offset,
                                                          @Param("pageSize") Integer pageSize,
                                                          @Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
 
+    List<Map<String,Object>> getSelectMaterialOutboundEngineering(@Param("offset") Integer offset,
+                                                             @Param("pageSize") Integer pageSize,
+                                                             @Param("materialOutboundDetail") MaterialOutboundDetail materialOutboundDetail);
+
     Map<String,Integer> getSelectMaterialOutboundDetailPageTotal(Integer offset, Integer pageSize,MaterialOutboundDetail materialOutboundDetail);
 
     ReturningWarehouse getSelectReturningWarehouse(@Param("offset") Integer offset,
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
index 5097935..cae036a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java
@@ -13,4 +13,6 @@
     boolean insertBatch(List<OrderDetail> orderDetails);
 
     boolean updateOrderMoney( List<OrderDetail> orderDetails);
+
+    List<OrderDetail> getOrderReport(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);
 }
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 0383287..a9be79f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.example.erp.entity.mm.*;
+import com.example.erp.entity.pp.OptimizeUse;
 import com.example.erp.entity.sd.Delivery;
 import com.example.erp.entity.sd.DeliveryDetail;
 import com.example.erp.entity.sd.OrderDetail;
@@ -54,8 +55,14 @@
                 List<MaterialOutboundDetail> materialOutboundDetailLists = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
                 if (!materialOutboundDetailLists.isEmpty()) {
                     for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailLists) {
-                        //杩樺師鐗╂枡搴撳瓨鏁�
-                        materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
+                        if(materialOutboundDetail.getUseId()!=null){
+                            //杩樺師浼樺寲宸ョ▼搴撳瓨鏁�
+                            materialInventoryMapper.updateMaterialInventoryAvailableOptInt(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
+                        }else{
+                            //杩樺師鐗╂枡搴撳瓨鏁�
+                            materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
+                        }
+
                     }
                 }
                 //鍒犻櫎鏉愭枡鍑哄簱鏄庣粏鐨勬暟鎹�
@@ -76,9 +83,14 @@
                     Integer materialOutboundDetailMaximum = materialInventoryMapper.getMaterialOutboundDetailMaximum(oddNumber);
                     //鏂板鏉愭枡鍑哄簱鏄庣粏鏁版嵁
                     materialInventoryMapper.insertMaterialOutboundDetail(materialOutboundDetail, oddNumber, materialOutboundDetailMaximum + 1);
-                    //淇敼鐗╂枡搴撳瓨琛ㄥ嚭搴撴暟閲�
-                    System.out.println(materialOutboundDetail.getInventoryId());
-                    materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
+                    if(materialOutboundDetail.getUseId()!=null){
+                        //淇敼浼樺寲宸ョ▼琛ㄥ嚭搴撴暟閲�
+                        materialInventoryMapper.updateMaterialInventoryAvailableOptOut(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
+                    }else{
+                        //淇敼鐗╂枡搴撳瓨琛ㄥ嚭搴撴暟閲�
+                        materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
+                    }
+
 
                 }
 
@@ -149,12 +161,43 @@
         return map;
     }
 
+    public Map<String, Object> getSelectMaterialInventoryEngineeringDate(Integer pageNum, Integer pageSize, List<String> selectDate, MaterialInventory materialInventory) {
+        Integer offset = (pageNum - 1) * pageSize;
+        String endDate = LocalDate.now().toString();
+        String startDate = LocalDate.now().minusDays(15).toString();
+        if(selectDate !=null && selectDate.size()==2){
+            if(!selectDate.get(0).isEmpty()){
+                startDate = selectDate.get(0);
+            }
+            if(!selectDate.get(1).isEmpty()){
+                endDate = selectDate.get(1);
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineeringDate(offset, pageSize,startDate, endDate, materialInventory));
+        map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringDatePageTotal(offset, pageSize,startDate, endDate, materialInventory));
+        List<String> list = new ArrayList<>();
+        list.add(startDate);
+        list.add(endDate);
+        map.put("selectDate",list);
+        return map;
+    }
+
     public Map<String, Object> getSelectMaterialInventory(Integer pageNum, Integer pageSize, MaterialInventory materialInventory) {
         Integer offset = (pageNum - 1) * pageSize;
 
         Map<String, Object> map = new HashMap<>();
         map.put("data", materialInventoryMapper.getSelectMaterialInventory(offset, pageSize, materialInventory));
         map.put("total", materialInventoryMapper.getSelectMaterialInventoryPageTotal(offset, pageSize, materialInventory));
+        return map;
+    }
+
+    public Map<String, Object> getSelectMaterialInventoryEngineering(Integer pageNum, Integer pageSize, OptimizeUse optimizeUse) {
+        Integer offset = (pageNum - 1) * pageSize;
+        System.out.println(optimizeUse);
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineering(offset, pageSize, optimizeUse));
+        map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringPageTotal(offset, pageSize, optimizeUse));
         return map;
     }
 
@@ -213,12 +256,21 @@
     public Map<String, Object> getSelectMaterialOutbound(Integer pageNum, Integer pageSize, MaterialOutboundDetail materialOutboundDetail) {
         Integer offset = (pageNum - 1) * pageSize;
         Map<String, Object> map = new HashMap<>();
-        System.out.println("鏁版嵁"+materialOutboundDetail);
-        map.put("materialOutbound", materialInventoryMapper.getSelectMaterialOutbound(offset, pageSize, materialOutboundDetail));
-        map.put("data", materialInventoryMapper.getSelectMaterialOutboundDetail(offset, pageSize, materialOutboundDetail));
-        map.put("total", materialInventoryMapper.getSelectMaterialOutboundDetailPageTotal(offset, pageSize, materialOutboundDetail));
+        List<MaterialOutboundDetail> materialOutboundDetailList= materialInventoryMapper.SelectMaterialOutboundDetail(offset, pageSize, materialOutboundDetail);
+        if(materialOutboundDetailList.get(0).getUseId()==null){
+            map.put("materialOutbound", materialInventoryMapper.getSelectMaterialOutbound(offset, pageSize, materialOutboundDetail));
+            map.put("data", materialInventoryMapper.getSelectMaterialOutboundDetail(offset, pageSize, materialOutboundDetail));
+            map.put("total", materialInventoryMapper.getSelectMaterialOutboundDetailPageTotal(offset, pageSize, materialOutboundDetail));
+        }else{
+            map.put("materialOutbound", materialInventoryMapper.getSelectMaterialOutbound(offset, pageSize, materialOutboundDetail));
+            map.put("data", materialInventoryMapper.getSelectMaterialOutboundEngineering(offset, pageSize, materialOutboundDetail));
+            map.put("total", materialInventoryMapper.getSelectMaterialOutboundDetailPageTotal(offset, pageSize, materialOutboundDetail));
+        }
+
         return map;
     }
+
+
 
     public Boolean updateMaterialOutboundToExamine(Map<String,Object> object) {
         boolean saveState = true;
@@ -243,8 +295,11 @@
                 List<MaterialOutboundDetail> materialOutboundDetailList = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
                 if (!materialOutboundDetailList.isEmpty()) {
                     for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailList) {
-                        //淇敼鐗╂枡搴撳瓨鏁伴噺
-                        materialInventoryMapper.updateMaterialInventoryInventoryOut(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
+                        if(materialOutboundDetail.getUseId()==null){
+                            //淇敼鐗╂枡搴撳瓨鏁伴噺
+                            materialInventoryMapper.updateMaterialInventoryInventoryOut(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
+                        }
+
                     }
                 }
                 materialInventoryMapper.updateMaterialOutboundToExamine(materialOutboundId,type,reviewed);
@@ -252,8 +307,11 @@
                 List<MaterialOutboundDetail> materialOutboundDetailList = materialInventoryMapper.getIsNotMaterialOutboundDetail(materialOutboundId);
                 if (!materialOutboundDetailList.isEmpty()) {
                     for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailList) {
-                        //淇敼鐗╂枡搴撳瓨鏁伴噺
-                        materialInventoryMapper.updateMaterialInventoryInventoryInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
+                        if(materialOutboundDetail.getUseId()==null){
+                            //淇敼鐗╂枡搴撳瓨鏁伴噺
+                            materialInventoryMapper.updateMaterialInventoryInventoryInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());
+                        }
+
                     }
                 }
                 materialInventoryMapper.updateMaterialOutboundCounterExamination(materialOutboundId,type,reviewed);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 16e1e34..48a4ac6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -248,4 +248,22 @@
     }
 
 
+    public Map<String,Object> getOrderReport(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
+        Integer offset = (pageNum-1)*pageSize;
+        String endDate = LocalDate.now().toString();
+        String startDate = LocalDate.now().minusDays(15).toString();
+        if(selectDate !=null && selectDate.size()==2){
+            if(!selectDate.get(0).isEmpty()){
+                startDate = selectDate.get(0);
+            }
+            if(!selectDate.get(1).isEmpty()){
+                endDate = selectDate.get(1);
+            }
+        }
+
+        Map<String,Object> map = new HashMap<>();
+        map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail));
+//        map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
+        return map;
+    }
 }
diff --git a/north-glass-erp/src/main/java/com/example/erp/tools/WebSocketServer.java b/north-glass-erp/src/main/java/com/example/erp/tools/WebSocketServer.java
index 5a3e083..a21c70e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/tools/WebSocketServer.java
+++ b/north-glass-erp/src/main/java/com/example/erp/tools/WebSocketServer.java
@@ -63,7 +63,7 @@
      */
     @OnMessage
     public void onMessage(Session session, String message) {
-        log.info("[onOpen][session({}) 鎺ユ敹鍒颁竴鏉℃秷鎭�({})]", session, message);
+        //log.info("[onOpen][session({}) 鎺ユ敹鍒颁竴鏉℃秷鎭�({})]", session, message);
         // TODO:  瀵逛簬瀹㈡埛绔彂閫佺殑鎸囦护淇℃伅锛岃В鏋愬悗杩涜瀵瑰簲鐨勯�昏緫澶勭悊
     }
 
diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 108874f..ca8f4f6 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -46,6 +46,49 @@
     </select>
 
 
+    <select id="getSelectMaterialInventoryEngineeringDate">
+        select
+        ou.id as useId,
+        ou.project_no as projectNo,
+        ou.use_count AS inventoryQuantity,
+        ou.not_use_count AS availableQuantity,
+        mi.id,
+        mi.inventory_organization as inventoryOrganization,
+        mi.material_code AS materialCode,
+        mi.producer,
+        mi.safety_stock AS safetyStock,
+        mi.total_area AS totalArea,
+        mi.single_piece_area singlePieceArea,
+        date(mi.date_of_manufacture) AS dateOfManufacture,
+        mi.quality_guarantee_period qualityGuaranteePeriod,
+        mi.inventory_area AS inventoryArea,
+        mi.dead_stock AS deadStock,
+        mi.remarks,
+        date(mi.create_time) AS createTime,
+        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
+        <where>
+            ou.not_use_count>0 and ou.state=1 and
+            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
+
+        </where>
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialInventoryEngineeringDatePageTotal">
+        select
+        CEILING(count(id)/#{pageSize}) as 'pageTotal',
+        count(id) as 'total'
+        from
+        pp.optimize_use ou
+        <where>
+            ou.not_use_count>0 and ou.state=1 and
+            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
+
+        </where>
+        limit #{offset},#{pageSize};
+    </select>
+
+
     <select id="getSelectMaterialInventory">
         select
         mi.id,
@@ -83,6 +126,53 @@
         <where>
             <if test="materialInventory.id != null and materialInventory.id != ''">
                 and mi.id regexp #{materialInventory.id}
+            </if>
+
+        </where>
+
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialInventoryEngineering">
+        select
+        ou.id as useId,
+        ou.project_no as projectNo,
+        ou.use_count AS inventoryQuantity,
+        ou.not_use_count AS availableQuantity,
+        mi.id,
+        mi.inventory_organization as inventoryOrganization,
+        mi.material_code AS materialCode,
+        mi.producer,
+        mi.safety_stock AS safetyStock,
+        mi.total_area AS totalArea,
+        mi.single_piece_area singlePieceArea,
+        date(mi.date_of_manufacture) AS dateOfManufacture,
+        mi.quality_guarantee_period qualityGuaranteePeriod,
+        mi.inventory_area AS inventoryArea,
+        mi.dead_stock AS deadStock,
+        mi.remarks,
+        date(mi.create_time) AS createTime,
+        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
+
+        <where>
+            <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
+                and ou.id regexp #{optimizeUse.rawStockCode}
+            </if>
+
+        </where>
+
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialInventoryEngineeringPageTotal">
+        select
+        CEILING(count(id)/#{pageSize}) as 'pageTotal',
+        count(id) as 'total'
+        from
+        pp.optimize_use ou
+        <where>
+            <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
+                and ou.id regexp #{optimizeUse.rawStockCode}
             </if>
 
         </where>
@@ -252,8 +342,20 @@
         limit #{offset},#{pageSize};
     </select>
 
+    <select id="SelectMaterialOutboundDetail" >
+        select
+        *
+        from mm.material_outbound_detail modd
+        <where>
+            <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
+                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
+            </if>
+        </where>
+    </select>
+
     <select id="getSelectMaterialOutboundDetail" >
         select
+        modd.use_id as useId,
         modd.inventory_id as id,
         modd.inventory_organization as inventoryOrganization,
         modd.material_code as materialCode,
@@ -274,6 +376,37 @@
         from mm.material_outbound_detail modd left join mm.material_inventory mi on modd.inventory_id=mi.id
             left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
             left join mm.material_store ms on modd.material_code=ms.id
+        <where>
+            <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
+                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
+            </if>
+        </where>
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialOutboundEngineering" >
+        select
+        ou.project_no as  projectNo,
+        modd.inventory_id as id,
+        modd.inventory_organization as inventoryOrganization,
+        modd.material_code as materialCode,
+        modd.material_name as materialName,
+        modd.producer,
+        modd.width,
+        modd.height,
+        modd.thickness,
+        modd.unit,
+        modd.outbound_quantity as outboundQuantity,
+        date(modd.date_of_manufacture) as dateOfManufacture,
+        modd.single_piece_area as singlePieceArea,
+        modd.inventory_area as inventoryArea,
+        modd.remarks,
+        ou.use_count as inventoryQuantity,
+        if(mo.reviewed_state!=1,modd.outbound_quantity+ou.not_use_count,ou.not_use_count) as availableQuantity,
+        ms.json
+        from mm.material_outbound_detail modd left join pp.optimize_use ou on modd.use_id=ou.id
+        left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
+        left join mm.material_store ms on modd.material_code=ms.id
         <where>
             <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
@@ -432,10 +565,10 @@
     </insert>
 
     <insert id="insertMaterialOutboundDetail"  useGeneratedKeys="true" >
-        insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,material_name,inventory_id,inventory_organization,producer,unit,width,
+        insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,material_name,use_id,inventory_id,inventory_organization,producer,unit,width,
                                                  height,thickness,outbound_quantity,single_piece_area,inventory_area,date_of_manufacture,remarks)
         values (
-                   #{number} ,#{materialOutboundNumber},#{materialOutboundDetail.materialCode},#{materialOutboundDetail.materialName},#{materialOutboundDetail.id},
+                   #{number} ,#{materialOutboundNumber},#{materialOutboundDetail.materialCode},#{materialOutboundDetail.materialName},#{materialOutboundDetail.useId},#{materialOutboundDetail.id},
                    #{materialOutboundDetail.inventoryOrganization},#{materialOutboundDetail.producer},#{materialOutboundDetail.unit},
                    #{materialOutboundDetail.width},#{materialOutboundDetail.height},#{materialOutboundDetail.thickness},#{materialOutboundDetail.outboundQuantity},
                 #{materialOutboundDetail.singlePieceArea},#{materialOutboundDetail.inventoryArea},#{materialOutboundDetail.dateOfManufacture},#{materialOutboundDetail.remarks}
@@ -484,6 +617,18 @@
                )
     </insert>
 
+    <update id="updateMaterialInventoryAvailableOptOut">
+        update pp.optimize_use
+        set not_use_count=not_use_count-#{quantity}
+        where id=#{useId}
+    </update>
+
+    <update id="updateMaterialInventoryAvailableOptInt">
+        update pp.optimize_use
+        set not_use_count=not_use_count+#{quantity}
+        where id=#{useId}
+    </update>
+
     <update id="updateMaterialInventoryAvailableOut">
         update mm.material_inventory
         set available_quantity=available_quantity-#{quantity}
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
index 044b8b7..a896f16 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetail.xml
@@ -67,5 +67,12 @@
         </foreach>
 
     </update>
+    
+<!--    <select id="getOrderReport">-->
+<!--        SELECT-->
+<!--            from order_detail as a-->
+<!--            left join sd.`order` o on o.id = a.order_id-->
+
+<!--    </select>-->
 
 </mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml b/north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml
index 108874f..ca8f4f6 100644
--- a/north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml
@@ -46,6 +46,49 @@
     </select>
 
 
+    <select id="getSelectMaterialInventoryEngineeringDate">
+        select
+        ou.id as useId,
+        ou.project_no as projectNo,
+        ou.use_count AS inventoryQuantity,
+        ou.not_use_count AS availableQuantity,
+        mi.id,
+        mi.inventory_organization as inventoryOrganization,
+        mi.material_code AS materialCode,
+        mi.producer,
+        mi.safety_stock AS safetyStock,
+        mi.total_area AS totalArea,
+        mi.single_piece_area singlePieceArea,
+        date(mi.date_of_manufacture) AS dateOfManufacture,
+        mi.quality_guarantee_period qualityGuaranteePeriod,
+        mi.inventory_area AS inventoryArea,
+        mi.dead_stock AS deadStock,
+        mi.remarks,
+        date(mi.create_time) AS createTime,
+        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
+        <where>
+            ou.not_use_count>0 and ou.state=1 and
+            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
+
+        </where>
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialInventoryEngineeringDatePageTotal">
+        select
+        CEILING(count(id)/#{pageSize}) as 'pageTotal',
+        count(id) as 'total'
+        from
+        pp.optimize_use ou
+        <where>
+            ou.not_use_count>0 and ou.state=1 and
+            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
+
+        </where>
+        limit #{offset},#{pageSize};
+    </select>
+
+
     <select id="getSelectMaterialInventory">
         select
         mi.id,
@@ -83,6 +126,53 @@
         <where>
             <if test="materialInventory.id != null and materialInventory.id != ''">
                 and mi.id regexp #{materialInventory.id}
+            </if>
+
+        </where>
+
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialInventoryEngineering">
+        select
+        ou.id as useId,
+        ou.project_no as projectNo,
+        ou.use_count AS inventoryQuantity,
+        ou.not_use_count AS availableQuantity,
+        mi.id,
+        mi.inventory_organization as inventoryOrganization,
+        mi.material_code AS materialCode,
+        mi.producer,
+        mi.safety_stock AS safetyStock,
+        mi.total_area AS totalArea,
+        mi.single_piece_area singlePieceArea,
+        date(mi.date_of_manufacture) AS dateOfManufacture,
+        mi.quality_guarantee_period qualityGuaranteePeriod,
+        mi.inventory_area AS inventoryArea,
+        mi.dead_stock AS deadStock,
+        mi.remarks,
+        date(mi.create_time) AS createTime,
+        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
+
+        <where>
+            <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
+                and ou.id regexp #{optimizeUse.rawStockCode}
+            </if>
+
+        </where>
+
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialInventoryEngineeringPageTotal">
+        select
+        CEILING(count(id)/#{pageSize}) as 'pageTotal',
+        count(id) as 'total'
+        from
+        pp.optimize_use ou
+        <where>
+            <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
+                and ou.id regexp #{optimizeUse.rawStockCode}
             </if>
 
         </where>
@@ -252,8 +342,20 @@
         limit #{offset},#{pageSize};
     </select>
 
+    <select id="SelectMaterialOutboundDetail" >
+        select
+        *
+        from mm.material_outbound_detail modd
+        <where>
+            <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
+                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
+            </if>
+        </where>
+    </select>
+
     <select id="getSelectMaterialOutboundDetail" >
         select
+        modd.use_id as useId,
         modd.inventory_id as id,
         modd.inventory_organization as inventoryOrganization,
         modd.material_code as materialCode,
@@ -274,6 +376,37 @@
         from mm.material_outbound_detail modd left join mm.material_inventory mi on modd.inventory_id=mi.id
             left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
             left join mm.material_store ms on modd.material_code=ms.id
+        <where>
+            <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
+                and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
+            </if>
+        </where>
+        limit #{offset},#{pageSize};
+    </select>
+
+    <select id="getSelectMaterialOutboundEngineering" >
+        select
+        ou.project_no as  projectNo,
+        modd.inventory_id as id,
+        modd.inventory_organization as inventoryOrganization,
+        modd.material_code as materialCode,
+        modd.material_name as materialName,
+        modd.producer,
+        modd.width,
+        modd.height,
+        modd.thickness,
+        modd.unit,
+        modd.outbound_quantity as outboundQuantity,
+        date(modd.date_of_manufacture) as dateOfManufacture,
+        modd.single_piece_area as singlePieceArea,
+        modd.inventory_area as inventoryArea,
+        modd.remarks,
+        ou.use_count as inventoryQuantity,
+        if(mo.reviewed_state!=1,modd.outbound_quantity+ou.not_use_count,ou.not_use_count) as availableQuantity,
+        ms.json
+        from mm.material_outbound_detail modd left join pp.optimize_use ou on modd.use_id=ou.id
+        left join mm.material_outbound mo on modd.material_outbound_id=mo.material_outbound_id
+        left join mm.material_store ms on modd.material_code=ms.id
         <where>
             <if test="materialOutboundDetail.materialOutboundId != null and materialOutboundDetail.materialOutboundId != ''">
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
@@ -432,10 +565,10 @@
     </insert>
 
     <insert id="insertMaterialOutboundDetail"  useGeneratedKeys="true" >
-        insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,material_name,inventory_id,inventory_organization,producer,unit,width,
+        insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,material_name,use_id,inventory_id,inventory_organization,producer,unit,width,
                                                  height,thickness,outbound_quantity,single_piece_area,inventory_area,date_of_manufacture,remarks)
         values (
-                   #{number} ,#{materialOutboundNumber},#{materialOutboundDetail.materialCode},#{materialOutboundDetail.materialName},#{materialOutboundDetail.id},
+                   #{number} ,#{materialOutboundNumber},#{materialOutboundDetail.materialCode},#{materialOutboundDetail.materialName},#{materialOutboundDetail.useId},#{materialOutboundDetail.id},
                    #{materialOutboundDetail.inventoryOrganization},#{materialOutboundDetail.producer},#{materialOutboundDetail.unit},
                    #{materialOutboundDetail.width},#{materialOutboundDetail.height},#{materialOutboundDetail.thickness},#{materialOutboundDetail.outboundQuantity},
                 #{materialOutboundDetail.singlePieceArea},#{materialOutboundDetail.inventoryArea},#{materialOutboundDetail.dateOfManufacture},#{materialOutboundDetail.remarks}
@@ -484,6 +617,18 @@
                )
     </insert>
 
+    <update id="updateMaterialInventoryAvailableOptOut">
+        update pp.optimize_use
+        set not_use_count=not_use_count-#{quantity}
+        where id=#{useId}
+    </update>
+
+    <update id="updateMaterialInventoryAvailableOptInt">
+        update pp.optimize_use
+        set not_use_count=not_use_count+#{quantity}
+        where id=#{useId}
+    </update>
+
     <update id="updateMaterialInventoryAvailableOut">
         update mm.material_inventory
         set available_quantity=available_quantity-#{quantity}
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
index 044b8b7..7ec4d2d 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderDetail.xml
@@ -67,5 +67,12 @@
         </foreach>
 
     </update>
+    
+    <select id="getOrderReport">
+        SELECT
+            from order_detail as a
+            left join sd.`order` o on o.id = a.order_id
+
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original b/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
index 2f29063..1b73ab7 100644
--- a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
+++ b/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
Binary files differ
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index fd8bf9a..bbdf872 100644
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -2,6 +2,7 @@
 com\example\erp\mapper\pp\BasicDateProduceMapper.class
 com\example\erp\entity\sd\Returns.class
 com\example\erp\entity\sd\Product.class
+com\example\erp\service\pp\ReportService.class
 com\example\erp\service\sd\BasicGlassTypeServise.class
 com\example\erp\service\sd\ProductService.class
 com\example\erp\entity\mm\FinishedOperateLog.class
@@ -11,6 +12,7 @@
 com\example\erp\config\MyCorsConfig$1.class
 com\example\erp\controller\pp\ProductionSchedulingController.class
 com\example\erp\service\sd\OrderProcessDetailService.class
+com\example\erp\entity\mm\MaterialOutboundDetail.class
 com\example\erp\controller\pp\ReworkController.class
 com\example\erp\entity\pp\DamageDetails.class
 com\example\erp\mapper\mm\BasicWarehouseTypeMapper.class
@@ -30,6 +32,7 @@
 com\example\erp\controller\sd\ProductController.class
 com\example\erp\entity\sd\GlassType.class
 com\example\erp\mapper\sd\OrderMapper.class
+com\example\erp\controller\pp\ReportController.class
 com\example\erp\service\mm\BasicWarehouseTypeService.class
 com\example\erp\mapper\OrderTestMapper.class
 com\example\erp\mapper\mm\MaterialStoreMapper.class
@@ -40,7 +43,6 @@
 com\example\erp\entity\sd\Customer.class
 com\example\erp\entity\userInfo\SysMenu.class
 com\example\erp\entity\sd\Delivery.class
-com\example\erp\controller\mm\MaterialController.class
 com\example\erp\controller\pp\BasicDataProduceController.class
 com\example\erp\config\WebSocketConfig.class
 com\example\erp\controller\dto\UserDTO.class
@@ -55,6 +57,7 @@
 com\example\erp\service\userInfo\SysMenuItemService.class
 com\example\erp\entity\pp\ReportingWorkDetail.class
 com\example\erp\controller\sd\DeliveryController.class
+com\example\erp\entity\mm\ReturningWarehouseDetail.class
 com\example\erp\service\impl\OrderServiceImpl.class
 com\example\erp\entity\sd\ProductDetail.class
 com\example\erp\mapper\pp\ReworkMapper.class
@@ -63,6 +66,7 @@
 com\example\erp\mapper\pp\FlowCardMapper.class
 com\example\erp\mapper\userInfo\SysMenuItemMapper.class
 com\example\erp\controller\userInfo\SysMenuController.class
+com\example\erp\entity\mm\ReturningWarehouse.class
 com\example\erp\entity\sd\Order.class
 com\example\erp\entity\sd\BasicGlassType.class
 com\example\erp\entity\sd\OrderGlassDetail.class
@@ -73,6 +77,7 @@
 com\example\erp\entity\pp\BaseBom.class
 com\example\erp\mapper\userInfo\SysErrorMapper.class
 com\example\erp\service\mm\FinishedGoodsInventoryService.class
+com\example\erp\entity\mm\MaterialInventory.class
 com\example\erp\entity\sd\ReturnsDetail.class
 com\example\erp\entity\sd\OrderProcessDetail.class
 com\example\erp\config\SwaggerConfig.class
@@ -86,10 +91,12 @@
 com\example\erp\exception\ServiceException.class
 com\example\erp\common\interceptor\JwtInterceptor.class
 com\example\erp\entity\pp\Rework.class
+com\example\erp\service\mm\MaterialStoreService.class
 com\example\erp\entity\pp\ReportingWork.class
 com\example\erp\tools\netty\MyWebSocketHandler.class
-com\example\erp\service\mm\MaterialService.class
+com\example\erp\entity\mm\MaterialOutbound.class
 com\example\erp\controller\sd\OrderController.class
+com\example\erp\mapper\pp\ReportMapper.class
 com\example\erp\entity\pp\BasicDataProduce.class
 com\example\erp\controller\pp\ReportWorkController.class
 com\example\erp\entity\pp\PatchLog.class
@@ -110,6 +117,7 @@
 com\example\erp\mapper\sd\ProductMapper.class
 com\example\erp\common\Result.class
 com\example\erp\service\sd\CustomerService.class
+com\example\erp\controller\mm\MaterialInventoryController.class
 com\example\erp\mapper\pp\DamageDetailsMapper.class
 com\example\erp\mapper\sd\OrderProcessDetailMapper.class
 com\example\erp\entity\pp\Device.class
@@ -117,7 +125,9 @@
 com\example\erp\controller\OrderTestController.class
 com\example\erp\mapper\userInfo\SysMenuMapper.class
 com\example\erp\tools\TokenTools.class
+com\example\erp\controller\mm\MaterialStoreController.class
 com\example\erp\mapper\sd\OrderDetailMapper.class
+com\example\erp\service\mm\MaterialInventoryService.class
 com\example\erp\controller\userInfo\SysMenuItemController.class
 com\example\erp\mapper\sd\ProductDetailMapper.class
 com\example\erp\entity\pp\FlowCard.class
@@ -125,6 +135,7 @@
 com\example\erp\controller\pp\WorkOrderController.class
 com\example\erp\entity\pp\DeviceMaintenance.class
 com\example\erp\tools\netty\NettyServer$1.class
+com\example\erp\mapper\mm\MaterialInventoryMapper.class
 com\example\erp\entity\userInfo\SysMenuItem.class
 com\example\erp\mapper\pp\ReportingWorkMapper.class
 com\example\erp\entity\sd\BasicData.class
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index ac515c0..8d12ab0 100644
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -2,7 +2,7 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\BasicDateProduceService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MybatisPlusConfig.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductDetailMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\GlassType.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\interceptor\JwtInterceptor.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\WorkOrderMapper.java
@@ -49,6 +49,7 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\FinishedOperateLogMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\FlowCardMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\TokenTools.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialInventoryController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportWorkController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialStore.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysMenuItem.java
@@ -65,12 +66,16 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\Result.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Returns.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\SysMenuService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\WorkOrderService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialStoreService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\dto\UserDTO.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportingWorkService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ProductDetail.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouseDetail.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\BasicWarehouseTypeService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderProcessDetailService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\MaterialInventoryMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyWebSocketHandler.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\FlowCard.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkDetailMapper.java
@@ -80,11 +85,14 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\InterceptorConfig.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\BasicDataProduce.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicGlassTypeServise.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutbound.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialInventoryService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MyCorsConfig.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\SwaggerConfig.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Device.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\ProductService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\OrderBom.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialStoreController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Order.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ProductionSchedulingService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\WebSocketServerPool.java
@@ -94,6 +102,7 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\DeliveryDetailMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysMenuItemMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\CacheUtil.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\FinishedGoodsInventoryController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\UserService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicGlassTypeMapper.java
@@ -117,6 +126,8 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\SysMenuController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\CustomerMapper.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\NettyServer.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialInventory.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouse.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderProcessDetail.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\BasicWarehouseType.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReplenishController.java
@@ -126,5 +137,5 @@
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\DeliveryService.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\OrderTestController.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\BasicWarehouseTypeMapper.java
-D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutboundDetail.java
 D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Product.java

--
Gitblit v1.8.0