From 24cf0b6db81cf1cad07d26c9bfbf12564681e7a3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 四月 2024 11:33:58 +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/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java | 14
north-glass-erp/target/classes/mapper/pp/FolwCard.xml | 17
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue | 2
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 17
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/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 9
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 29 +
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 10
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 155 ++++-----
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 4
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/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue | 16
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 4
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/pp/ProductionSchedulingService.java | 8
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 84 ++++
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 6
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 149 ++++++++
north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml | 149 ++++++++
north-glass-erp/target/classes/mapper/pp/Report.xml | 6
26 files changed, 743 insertions(+), 239 deletions(-)
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/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index f18bce5..93d46f5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -48,16 +48,6 @@
return count.toFixed(2)
}
-//棣栨鍔犺浇
-request.post(`/maintenance/selectMaintenance`).then((res) => {
- if (res.code === 200) {
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
-})
//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index ab7fd0a..de7e907 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -171,7 +171,7 @@
{type: 'checkbox', fixed: "left", title: t('basicData.check')},
{
field: 'orderNumber',
- title: t('basicData.check'),
+ title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -288,7 +288,7 @@
},
{
field: 'landingSequence',
- title: t('processCard.technologyNumber'),
+ title: '钀芥灦椤哄簭',
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index 38e8fa5..3c8ba1d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -113,10 +113,10 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
+ .slice(0, 10) //榛樿寮�濮嬫椂闂�3澶╁墠
const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
.toISOString()
.replace('T', ' ')
@@ -129,7 +129,7 @@
addListener(xGrid.value,gridOptions)
})
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
form.date1 = getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
@@ -546,7 +546,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
case 'copyAll' :{
@@ -560,7 +559,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
case 'clearChecked' :{
@@ -573,7 +571,6 @@
}
})
}
- gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 3e96af6..dab4cd4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -138,6 +138,8 @@
{field: 'order_number', title: '璁㈠崟搴忓彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
{field: 'technology_number', title: '灏忕墖椤哄簭' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
{field: 'quantity', title: '鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
+ {field: 'child_width', title: '瀹�', },
+ {field: 'child_height', title: '楂�', },
{field: 'area', title: '闈㈢Н' ,showOverflow:"ellipsis"},
{field: 'product_name', title: '浜у搧鍚嶇О', },
{field: 'glass_child', title: '鍗曠墖鍚嶇О', },
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index cbd78d3..7be61b3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -3,31 +3,21 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElDatePicker, ElMessage} from "element-plus"
-import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
-import {Search} from "@element-plus/icons-vue"
-import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
-import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
-import {VXETable} from "vxe-table";
-import { useI18n } from 'vue-i18n'
+import {useI18n} from 'vue-i18n'
+import {changeFilterEvent, filterChanged} from "@/hook"
//璇█鑾峰彇
-const { t } = useI18n()
-let router=useRouter()
-const getTableRow = (row,type) =>{
+const {t} = useI18n()
+let router = useRouter()
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
+ case 'edit' : {
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/processCard/AddProcessCard', query: { orderId: row.orderId,productionId:row.orderGlassDetail.productionId }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
+ router.push({
+ path: '/main/processCard/AddProcessCard',
+ query: {orderId: row.orderId, productionId: row.orderGlassDetail.productionId}
+ })
break
}
}
@@ -50,10 +40,10 @@
orderGlassDetail: {
productionId: '',
},
- orderDetail:{
- orderId:'',
- productId:'',
- productName:'',
+ orderDetail: {
+ orderId: '',
+ productId: '',
+ productName: '',
}
@@ -66,17 +56,16 @@
let pageNum = $ref(1)
let pageState = null
-const { currentRoute } = useRouter()
+const {currentRoute} = useRouter()
const route = currentRoute.value
-let id=route.query.orderId
+let id = route.query.orderId
+// 绗竴娆″姞杞芥煡璇�
request.post(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {
if (res.code == 200) {
- pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
- console.log('produceList', produceList)
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -94,45 +83,12 @@
}
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-const changeFilterEvent = (event, option, $panel,) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
-
-function filterChanged(column) {
- gridOptions.loading = true
- //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0] != undefined ? column.datas[0] : ''
- value = value.trim()
- //鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.') > -1) {
- const columnArr = column.property.split('.')
- filterData.value[columnArr[0]] = {
- [columnArr[1]]: value
- }
- } else {
- filterData.value[column.property] = value
- }
-
- request.post(`/processCard/detailsSelect/${id}`, filterData.value).then((res) => {
- if (res.code == 200) {
- pageTotal.value = res.data.total
- produceList = deepClone(res.data.data)
-
- xGrid.value.loadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
const hasDecimal = (value) => {
const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
return regex.test(value); // 杩斿洖true/false
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
const gridOptions = reactive({
loading: true,
@@ -140,7 +96,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'demo_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -154,7 +110,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -164,17 +120,42 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: t('basicData.operate'), width: 80, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
- {field: 'orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
- {field: 'orderGlassDetail.productionId', title: t('workOrder.productionId'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productId', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'orderDetail.quantity', title: t('order.quantity'),showOverflow:"ellipsis"},
- {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
- {field: 'orderDetail.perimeter', title: t('workOrder.perimeter'),},
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {title: t('basicData.operate'), width: 80, slots: {default: 'button_slot'}, fixed: "left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {
+ field: 'order_id',
+ title: t('order.orderId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'production_id',
+ title: t('workOrder.productionId'),
+ showOverflow: "ellipsis",
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'product_id',
+ title: t('order.productId'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 'product_name',
+ title: t('order.product'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {field: 'quantity', title: t('order.quantity'), showOverflow: "ellipsis"},
+ {field: 'compute_gross_area', title: t('order.area'),},
+ {field: 'perimeter', title: t('workOrder.perimeter'),},
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -189,9 +170,9 @@
},
data: null,//琛ㄦ牸鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['data.orderDetail.quantity','data.orderDetail.computeGrossArea']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['data.orderDetail.quantity', 'data.orderDetail.computeGrossArea']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
@@ -207,18 +188,17 @@
})
-
</script>
<template>
<div class="main-div-customer">
<vxe-grid
- max-height="100%"
- height="600px"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
ref="xGrid"
+ class="mytable-scrollbar"
+ height="600px"
+ max-height="100%"
v-bind="gridOptions"
+
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -236,14 +216,17 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
+ <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{ $t('basicData.edit') }}
+ </el-button>
</template>
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="text"
+ v-model="option.data"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -254,7 +237,7 @@
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
height: 100%;
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
index a44f8c2..96c9a64 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
@@ -74,6 +74,11 @@
return count.toFixed(2)
}
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
//棣栨鍔犺浇
request.post(`/basicDataProduce/selectBasic`).then((res) => {
if (res.code == 200) {
@@ -119,10 +124,10 @@
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'id', width: 60, title: 'id',filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'basic_type',width: 370, title: '绫诲瀷', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'basic_name', width: 330,title: '鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'd_basic_name',width: 330, title: '绫诲埆',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'id', width: 60, title: 'id',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged,},
+ {field: 'basic_type',width: 370, title: '绫诲瀷', showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'basic_name', width: 330,title: '鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'd_basic_name',width: 330, title: '绫诲埆'},
],
//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -179,7 +184,6 @@
<div class="main-div-customer">
<vxe-grid
max-height="100%"
- @filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -207,7 +211,7 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
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/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/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 1efab6e..0adef47 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -26,7 +26,7 @@
List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
//鍒嗘灦鏄庣粏鏌ヨ
- List<FlowCard> detailsSelectMp(String orderId, FlowCard flowCard);
+ List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
//鍒犻櫎娴佺▼鍗�
Boolean deleteFlowCardMp(String orderId, String processId);
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/pp/ProductionSchedulingService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
index f0c1284..75c9eb4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
@@ -26,10 +26,10 @@
//鏈帓浜ф煡璇�
public Map<String, Object> selectSchedulingSv(String selectTime1, String selectTime2, String orderId,String processes, Integer state, ProductionScheduling productionScheduling ) {
Map<String, Object> map = new HashMap<>();
- if(orderId.equals("null")){
+ if("null".equals(orderId)){
orderId="";
}
- if (processes.equals("null")){
+ if ("null".equals(processes)){
processes="";
}
@@ -49,10 +49,10 @@
//棣栨鏌ヨ鎺掍骇鏁版嵁
public Map<String, Object> selectLastScheduling(String selectTime1, String selectTime2,String processes,String orderId,ProductionScheduling productionScheduling ) {
Map<String, Object> map = new HashMap<>();
- if(orderId.equals("null")){
+ if("null".equals(orderId)){
orderId="";
}
- if (processes.equals("null")){
+ if ("null".equals(processes)){
processes="";
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 3eeeeeb..0e02dec 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -404,7 +404,7 @@
//鎶ュ伐绠＄悊鏌ヨ
public Map<String, Object> selectReportingWorkSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, String orderId, ReportingWork reportingWork) {
Integer offset = (pageNum - 1) * pageSize;
- if (orderId.equals("null")) {
+ if ("null".equals(orderId)) {
orderId = "";
}
Map<String, Object> map = new HashMap<>();
@@ -479,7 +479,7 @@
//鏌ヨ璐ㄦ瀹℃牳
public Map<String, Object> selectQualityTestingSv(Integer pageNum, Integer pageSize, java.sql.Date selectTime1, java.sql.Date selectTime2, Integer state, String processId, ReportingWork reportingWork) {
Integer offset = (pageNum - 1) * pageSize;
- if (processId.equals("null")) {
+ if ("null".equals(processId)) {
processId = "";
}
Map<String, Object> map = new HashMap<>();
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index 73c8648..3b90001 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -90,13 +90,13 @@
if (!orderId.isEmpty() && !productName.isEmpty()) {
//鍒犻櫎璁㈠崟灏忕墖琛ㄧ敓浜ц鍗曞彿
workOrderMapper.deleteOrderWorkMp(orderId, productName);
- Integer state = 0;
- Integer states = 1;
+ int state = 0;
+ int states = 1;
//鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
//鏌ヨ璇ヨ鍗曡浆鐢熶骇璁㈠崟鐨勬潯鏁�
Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
- if (noWorkCount == yesWorkCount) {
+ if (noWorkCount.equals(yesWorkCount)) {
workOrderMapper.updateWorkType(orderId, state);
} else {
workOrderMapper.updateWorkType(orderId, states);
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) <= #{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) <= #{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/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 3d6aeab..a5e2346 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -167,7 +167,7 @@
</select>
<!-- 鍒嗘灦鏄庣粏鏌ヨ-->
- <select id="detailsSelectMp" resultMap="flowCardMap">
+ <select id="detailsSelectMp">
select od.order_id,
ogd.production_id,
od.product_id,
@@ -180,18 +180,7 @@
GROUP BY order_id,order_number
) as ogd on od.order_id=ogd.order_id and od.order_number=ogd.order_number
where od.order_id = #{orderId} and ogd.splitting_status=0
- <if test="flowCard.orderId != null and flowCard.orderId != ''">
- and od.order_id regexp #{flowCard.orderId}
- </if>
- <if test="flowCard.orderGlassDetail.productionId != null and flowCard.orderGlassDetail.productionId != ''">
- and ogd.production_id regexp #{flowCard.orderGlassDetail.productionId}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and od.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
- and od.product_name regexp #{flowCard.orderDetail.productName}
- </if>
+
group by od.order_id, ogd.production_id
order by od.id desc
</select>
@@ -392,6 +381,8 @@
fc.order_number,
fc.technology_number,
fc.quantity,
+ ogd.child_width,
+ ogd.child_height,
round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
od.product_name,
ogd.glass_child,
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) <= #{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) <= #{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/pp/FolwCard.xml b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
index 3d6aeab..a5e2346 100644
--- a/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/target/classes/mapper/pp/FolwCard.xml
@@ -167,7 +167,7 @@
</select>
<!-- 鍒嗘灦鏄庣粏鏌ヨ-->
- <select id="detailsSelectMp" resultMap="flowCardMap">
+ <select id="detailsSelectMp">
select od.order_id,
ogd.production_id,
od.product_id,
@@ -180,18 +180,7 @@
GROUP BY order_id,order_number
) as ogd on od.order_id=ogd.order_id and od.order_number=ogd.order_number
where od.order_id = #{orderId} and ogd.splitting_status=0
- <if test="flowCard.orderId != null and flowCard.orderId != ''">
- and od.order_id regexp #{flowCard.orderId}
- </if>
- <if test="flowCard.orderGlassDetail.productionId != null and flowCard.orderGlassDetail.productionId != ''">
- and ogd.production_id regexp #{flowCard.orderGlassDetail.productionId}
- </if>
- <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
- and od.product_id regexp #{flowCard.orderDetail.productId}
- </if>
- <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">
- and od.product_name regexp #{flowCard.orderDetail.productName}
- </if>
+
group by od.order_id, ogd.production_id
order by od.id desc
</select>
@@ -392,6 +381,8 @@
fc.order_number,
fc.technology_number,
fc.quantity,
+ ogd.child_width,
+ ogd.child_height,
round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
od.product_name,
ogd.glass_child,
diff --git a/north-glass-erp/target/classes/mapper/pp/Report.xml b/north-glass-erp/target/classes/mapper/pp/Report.xml
index 3778507..70dfae6 100644
--- a/north-glass-erp/target/classes/mapper/pp/Report.xml
+++ b/north-glass-erp/target/classes/mapper/pp/Report.xml
@@ -63,7 +63,7 @@
e.reportWorkQuantityCount,
e.broken_num,
round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
-
+
from
flow_card as c
left join
@@ -96,8 +96,8 @@
) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
-
+
where a.order_id = #{orderId}
-
+
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0