rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
曹鹏飞 2026-03-30 18:50:10 +08:00
parent 6eb9ec648e 401c51a4b5
commit 8b087ce00a
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/resources/template/外协领料单.html
View File

@ -138,7 +138,7 @@
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title">委外发货清单</div>
<div class="title">外协领料单</div>
</div>
</div>
<div class="table-desc">

4
nflg-wms-admin/src/main/resources/template/成本中心退料单.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>成本中心退料单</title>
<title>成本中心退料入库单</title>
<style>
@page {
size: A4 landscape; /* 横向 A4 */
@ -138,7 +138,7 @@
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title">部门退料单</div>
<div class="title">成本中心退料入库单</div>
</div>
</div>
<div class="table-desc">

4
nflg-wms-admin/src/main/resources/template/生产入库单.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>成品/半成品入库单</title>
<title>成品订单入库单</title>
<style>
@page {
size: A4 landscape; /* 横向 A4 */
@ -140,7 +140,7 @@
</div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title" th:text="${base.title}">成品/半成品入库单</div>
<div class="title" th:text="${base.title}">成品订单入库单</div>
</div>
</div>
<div class="table-desc">

4
nflg-wms-admin/src/main/resources/template/生产领料出库单.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>成品发货出库单</title>
<title>生产领料出库单</title>
<style>
@page {
size: A4 landscape; /* 横向 A4 */
@ -126,7 +126,7 @@
<div class="package-logo" style="margin: 5px;position:absolute;"><img src="../img/logo1.png"/></div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title" th:text="${base.title}">成品发货出库单</div>
<div class="title" th:text="${base.title}">生产领料出库单</div>
</div>
</div>
<div class="table-desc">

4
nflg-wms-admin/src/main/resources/template/采购退货申请单.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>采购退货申请单</title>
<title>退货申请单</title>
<style>
@page {
size: A4 landscape; /* 横向 A4 */
@ -139,7 +139,7 @@
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title">采购退库单</div>
<div class="title">退货申请单</div>
</div>
</div>
<div class="table-desc">

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentOutboundQO.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.qo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@ -22,6 +23,7 @@ public class ComponentOutboundQO extends PageQO {
/**
* 办事处代理商
*/
@JsonProperty("pName")
private String pName;