From e9e776e4ad2f191496defcca1a0250b2c49c9f4f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 二月 2025 16:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/stockReport/MaterialOutboundReport.vue | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 17 ++++----
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 2
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue | 8 ++--
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 15 +++++--
north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml | 15 +++++--
north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java | 2 +
north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java | 2 +
8 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
index 62ae223..dc4add1 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -171,8 +171,8 @@
<tr v-if="index===0">
<th style="width: 6%;font-weight: bold;">搴�</th>
<th style="width: 15%;font-weight: bold;" >妤煎眰缂栧彿</th>
- <th style="width: 20%;font-weight: bold;" colspan="3">瀹絏楂�</th>
- <th style="width: 12%;font-weight: bold;">鏁伴噺</th>
+ <th style="width: 25%;font-weight: bold;" colspan="3">瀹絏楂�</th>
+ <th style="width: 8%;font-weight: bold;">鏁伴噺</th>
<th style="width: 12%;font-weight: bold;">闈㈢Н</th>
<th style="width: 17%;font-weight: bold;" colspan="2">鍔犲伐瑕佹眰</th>
</tr>
@@ -189,9 +189,9 @@
<td>{{items.orderNumber}}</td>
<td>{{items.buildingNumber}}</td>
<td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
- <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else-if="items.differentSize===1 && items.bendRadius==null">
+ <td colspan="3" style="font-size: 17px;white-space:nowrap;font-weight: bold;" v-else-if="items.differentSize===1 && items.bendRadius==null">
<template v-for="(orderGlassDetail, index1) in items.orderGlassDetails" >
- ({{orderGlassDetail.childWidth}}x{{orderGlassDetail.childHeight}})
+ ({{orderGlassDetail.childWidth}}x{{orderGlassDetail.childHeight}})
</template>
</td>
<td colspan="3" style="font-size: 20px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
diff --git a/north-glass-erp/northglass-erp/src/views/mm/stockReport/MaterialOutboundReport.vue b/north-glass-erp/northglass-erp/src/views/mm/stockReport/MaterialOutboundReport.vue
index 4ecd539..90912a8 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/stockReport/MaterialOutboundReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/stockReport/MaterialOutboundReport.vue
@@ -14,6 +14,7 @@
{field: 'operationOrderNumber', width:'150', title: t('productStock.operationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'operationNumber', width: '100',title: t('order.OrderNum'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'operateType', width: '120',title:t('warehouseBasicData.type'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'projectNo', width: '120',title:t('ingredientsStock.projectNo'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'quantity', width: '140',title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'inventoryId',width: '100', title: t('ingredientsStock.id'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'materialCode',width: '140', title: t('ingredients.materialCode'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 1541e73..eabdf49 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -122,7 +122,7 @@
"{display:none}@media print{" +
"@page {" +
" size: auto; " +
- " margin: 13mm 4mm 0mm 4mm; " +
+ " margin: 13mm 4mm 2mm 4mm; " +
" }body>:not(#" +
printId +
"){display:none !important}body>#" +
@@ -173,19 +173,19 @@
</div>
<div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
- <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator" style="font-size: 7pt;">
+ <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator" style="font-size: 7pt;">
({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
</span>
- <span v-if="item.stock_id!==null && !company.showDeliveryCreator" style="font-size: 7pt">
+ <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator" style="font-size: 7pt">
{{ item.stock_id }}/{{ item.polys_id }}
</span>
{{JSON.parse(item.other_columns).S02}}={{item.quantity}}
</div>
<div class="row3" v-else>
- <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator" style="font-size: 7pt;">
+ <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator" style="font-size: 7pt;">
({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
</span>
- <span v-if="item.stock_id!==null && !company.showDeliveryCreator" style="font-size: 7pt">
+ <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator" style="font-size: 7pt">
{{ item.stock_id }}/{{ item.polys_id }}
</span>
{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
@@ -288,7 +288,7 @@
.row1 {
font-size: 8pt;
font-weight: bold;
- height: 15px;
+ height: 20px;
}
.row1 span {
font-size: 10pt;
@@ -318,13 +318,12 @@
.row3 {
margin-top: -5px;
- height: 20px;
+ height: 25px;
font-size: 15pt;
font-weight: bolder;
}
.row5 {
- margin-top: 5px;
height: 15px;
font-weight: bold;
font-size: 6pt;
@@ -335,7 +334,7 @@
}
.row6 {
- height: 15px;
+ height: 25px;
font-weight: bold;
font-size: 4pt;
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index b53800b..891ff1f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -1187,7 +1187,7 @@
return
}
titleUploadData.value.project = item.project
- titleUploadData.value.salesmanId = item.salesmanId
+ titleUploadData.value.salesmanId = parseInt(item.salesmanId)
titleUploadData.value.salesman = item.salesman
titleUploadData.value.contacts = item.contacts
titleUploadData.value.contactNumber = item.contactNumber
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
index 4c52000..5d74b7a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialLog.java
@@ -43,6 +43,8 @@
private String inventoryArea;
@ExcelProperty("澶囨敞")
private String remarks;
+ @ExcelProperty("宸ョ▼鍙�")
+ private String projectNo;
@ExcelProperty("鎿嶄綔浜�")
private String operator;
@ExcelProperty("鍒涘缓鏃堕棿")
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 da6c154..9a2598c 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
@@ -252,4 +252,6 @@
Boolean updateOptimizeUsesMes(@Param("useId") Integer useId,@Param("quantity") Integer quantity);
+ String selectProjectNo(@Param("useId") Integer useId);
+
}
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 3f94c04..24dca0a 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
@@ -93,6 +93,7 @@
//鍒犻櫎鏉愭枡鍑哄簱鏄庣粏鐨勬暟鎹�
materialInventoryMapper.deleteMaterialOutboundDetail(materialOutboundId);
materialInventoryMapper.updateMaterialOutbound(materialOutbound, materialOutboundId);
+ materialInventoryMapper.deleteMaterialLog(materialOutboundId);
oddNumber = materialOutboundId;
log.setFunction("saveMaterialOutbound淇敼:"+oddNumber);
} else {
@@ -114,13 +115,16 @@
materialInventoryMapper.insertMaterialOutboundDetail(materialOutboundDetail, oddNumber, materialOutboundDetailMaximum + 1);
//淇敼鐗╂枡搴撳瓨琛ㄥ嚭搴撴暟閲�
materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
- if(materialOutboundDetail.getUseId()!=null){
- //淇敼浼樺寲宸ョ▼琛ㄥ嚭搴撴暟閲�
- materialInventoryMapper.updateMaterialInventoryAvailableOptOut(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
- }/*else{
+ String projectNo="";
+ if(materialOutboundDetail.getUseId()!=null){
+ projectNo = materialInventoryMapper.selectProjectNo(materialOutboundDetail.getUseId());
+ //淇敼浼樺寲宸ョ▼琛ㄥ嚭搴撴暟閲�
+ materialInventoryMapper.updateMaterialInventoryAvailableOptOut(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
+
+ }/*else{
//淇敼鐗╂枡搴撳瓨琛ㄥ嚭搴撴暟閲�
materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
- }*/
+ }*/
String json="";
MaterialStore materialStore=materialStoreMapper.getSelectMaterialStoreById(Long.valueOf(materialOutboundDetail.getMaterialCode()));
json=materialStore.getJson().substring(1, materialStore.getJson().length() - 1);
@@ -140,6 +144,7 @@
materialLog.setInventoryId(materialOutboundDetail.getId());
materialLog.setInventoryArea(materialInventory.getInventoryArea());
materialLog.setRemarks(materialOutboundDetail.getRemarks());
+ materialLog.setProjectNo(projectNo);
materialLog.setOperator(object.get("userName").toString());
materialLog.setOperateTime(LocalDate.now());
materialLogMapper.insert(materialLog);
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 6a98ee0..4a0d587 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -984,6 +984,9 @@
<if test="materialLog.remarks != null and materialLog.remarks != ''">
and ml.remarks regexp #{materialLog.remarksr}
</if>
+ <if test="materialLog.projectNo != null and materialLog.projectNo != ''">
+ and ml.project_no regexp #{materialLog.projectNo}
+ </if>
</where>
order by ml.id desc
limit #{offset},#{pageSize};
@@ -1087,13 +1090,13 @@
</where>
</select>
- <select id="updateMaterialOutboundOptimizeUses">
+ <update id="updateMaterialOutboundOptimizeUses">
update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
- </select>
+ </update>
- <select id="updateOptimizeUsesMes">
+ <update id="updateOptimizeUsesMes">
update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};
- </select>
+ </update>
<insert id="insertMaterialOutboundDetailOptimizeUses" useGeneratedKeys="true" >
insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,use_id,inventory_id,inventory_organization,
@@ -1112,5 +1115,9 @@
)
</insert>
+ <select id="selectProjectNo">
+ select project_no from pp.optimize_use where id=#{useId};
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0