From e751dae69fcb03dc4d0df9751232cead76148d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 28 Feb 2026 09:33:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20bug-1343=20=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=89=93=E5=8D=B0=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/template/生产领料单.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nflg-wms-admin/src/main/resources/template/生产领料单.html b/nflg-wms-admin/src/main/resources/template/生产领料单.html index 065cd2b1..1a0c79e0 100644 --- a/nflg-wms-admin/src/main/resources/template/生产领料单.html +++ b/nflg-wms-admin/src/main/resources/template/生产领料单.html @@ -7,19 +7,18 @@
-
-
发货清单
-
-
ZL-4.15(3-04)
-
福建南方路面机械股份有限公司
-
装车号：V01
-
 
-
-
-
订单号
-
- 1172000 -
-
发货员
-
程慧芳 -
-
办事处/代理商
-
测试 -
-
发货日期
-
- 2025-08-04 -
-
发运方式
-
  +
+ 福建南方路面机械股份有限公司
Fujian South Highway Machinery Co., Ltd.
-
-
设备编码
-
- 22222222222 -
-
收货人电话
-
于文强18365529799 -
-
货单号
-
0000 -
-
-
-
收货单位
-
- 安徽华恒创远新材料有限责任公司 -
-
签收人/电话
-
 
-
-
-
收货地址
-
- 安徽华恒创远新材料有限责任公司 -
-
收货日期
-
2025-08-04
-
-
-
司机
-
- 于文强 -
-
驾驶证
-
- 51254685465465465 -
-
车牌号
-
- 粤A12345 -
-
司机电话
-
18888888888 -
-
-
-
序号
-
配件编码
-
配件名称
-
货位号
-
单位
-
数量
-
备注
-
-
-
1
-
2100552783 -
-
- IH1213T.4 衬板6号 -
-
E1-4-4 -
-
PC -
-
20.000 -
-
  -
-
-
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
+ + + + + + + + + +
+ 发货清单
Shipping List + 		+ 货单编号
Shipping Order Number +
+ ZL-4.15(3-04) +
+ + + + + + + + + + + + + + + + + + + + + +
订单号
Order No.		1172000设备编码
Equipment Code		200012111
收货单位
Consignee Unit		安徽华恒创远新材料有限责任公司收货地址
Consignee Address		1172000
收货人/电话
Consignee's Phone No.		于文强18365529799签收人/电话
Signatory/Phone No.		收货日期
Receipt Date
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
发货员
Dispatcher		程慧芳发货日期
Shipping Date		2025-08-04办事处/代理商
Office/Agent		测试
发运方式
Shipping Method		汽车货单号
Waybill No.		0000装车号
Loading No.		V01
车牌号
License Plate No.		粤A12345司机
Driver		于文强驾驶证
Driver's License No.		电话
Phone No.		18888888888
+ + + + + + + + + + + + + + + + + + + +
序号
Serial No.		配件编码
Spare Part Code		配件名称
Spare Part Name		货位号
Storage Location No.		单位
Unit		数量
Quantity		备注
Remarks
12100552783IH1213T.4 衬板6号E1-4-4PC20.000 
\ No newline at end of file From 14b63082c10423b692948034b384c22e84760800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 28 Feb 2026 14:59:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(material):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 实现了 syncSearch 接口用于根据图纸编号列表查询材料信息 - 添加了接口文档注释说明参数和功能 - 使用 LambdaQuery 查询数据库中的材料记录 - 返回成功响应并封装为 ApiResult 格式 --- .../wms/shipment/controller/MaterialController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java index bf233b21..7d61a2d2 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java @@ -125,6 +125,19 @@ public class MaterialController extends BaseController { ); } + /** + * 同步-查询 + * @param materialNos 图纸编号列表 + */ + @PostMapping("syncSearch") + public ApiResult> syncSearch(@RequestBody @NotEmpty List materialNos) { + return ApiResult.success( + shipmentMaterialService.lambdaQuery() + .in(WmsShipmentMaterial::getNo, materialNos) + .list() + ); + } + /** * 同步-保存 */