From 71678dded4210aee67c62440ab781258718340c8 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 25 Dec 2024 19:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=BB=91=E5=AE=9A=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/service/impl/PurchaseBindServiceImpl.java | 5 +++++ .../mapper/material/purchase/PurchaseBindMapper.xml | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index fa6d16a5..ae2d63f8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -149,6 +149,11 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { if (purchaseBindMapper.bindMaCodeByQrCode(purchaseDto) != 1) { return AjaxResult.error(1115,"绑定maCode时SQL执行失败!"); } + } else { + if (dto.getTypeId() != null) { + purchaseDto.setTypeId(dto.getTypeId()); + } + purchaseBindMapper.insert(purchaseDto); } if (purchaseStorageMapper.insertMachine(purchaseDto) != 1) { return AjaxResult.error(1116,"插入maMachine时SQL执行失败!"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml index 79cd87b3..4354ab13 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml @@ -51,6 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type_id, + + ma_code, + qr_url, @@ -71,6 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{typeId}, + + #{maCode}, + #{qrUrl},