From ac5f82ea3f23016612730fa41199096f0dd176b2 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Sun, 18 Feb 2024 17:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=99=A8=E5=85=B7=E7=BB=91?= =?UTF-8?q?=E5=AE=9ArfidCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MaLabelBindServiceImpl.java | 37 ++++++++----------- .../material/domain/PurchaseMacodeInfo.java | 12 ++++++ .../impl/PurchaseMacodeInfoServiceImpl.java | 2 + 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java index fea8bb50..9f4d2c2a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java @@ -17,8 +17,7 @@ import java.util.List; * @date 2023-12-13 */ @Service -public class MaLabelBindServiceImpl implements IMaLabelBindService -{ +public class MaLabelBindServiceImpl implements IMaLabelBindService { @Resource private MaLabelBindMapper maLabelBindMapper; @@ -29,8 +28,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService * @return 机具设备标签ma_label_bind */ @Override - public MaLabelBindVO selectMaLabelBindByMaId(Long maId) - { + public MaLabelBindVO selectMaLabelBindByMaId(Long maId) { return maLabelBindMapper.selectMaLabelBindByMaId(maId); } @@ -41,8 +39,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService * @return 机具设备标签ma_label_bind */ @Override - public List selectMaLabelBindList(MaLabelBindVO maLabelBindVO) - { + public List selectMaLabelBindList(MaLabelBindVO maLabelBindVO) { return maLabelBindMapper.selectMaLabelBindList(maLabelBindVO); } @@ -53,10 +50,10 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService * @return 机具设备标签ma_label_bind */ @Override - public List selecthistoryList(MaLabelBindVO maLabelBindVO) - { + public List selecthistoryList(MaLabelBindVO maLabelBindVO) { return maLabelBindMapper.selecthistoryList(maLabelBindVO); } + /** * 绑定机具设备标签ma_label_bind * @@ -64,15 +61,14 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService * @return 结果 */ @Override - public AjaxResult insertMaLabelBind(MaLabelBindVO maLabelBind) - { + public AjaxResult insertMaLabelBind(MaLabelBindVO maLabelBind) { int i = 0; - int b =0; + int b = 0; MaLabelBindVO bean = maLabelBindMapper.selectMaMachineMaId(maLabelBind.getMaCode()); - if(null != bean){ + if (null != bean) { return AjaxResult.error("设备编码已绑定！！！"); - }else { - MaMachine maMachine =new MaMachine(); + } else { + MaMachine maMachine = new MaMachine(); maMachine.setMaCode(maLabelBind.getMaCode()); maMachine.setTypeId(maLabelBind.getTypeId()); maMachine.setQrCode(maLabelBind.getLabelCode()); @@ -80,9 +76,9 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService maLabelBind.setMaId(String.valueOf(maMachine.getMaId())); maLabelBind.setStatus("1"); maLabelBind.setIsBind("1"); - b=maLabelBindMapper.updateMaLabelBindMaIds(maLabelBind); + b = maLabelBindMapper.updateMaLabelBindMaIds(maLabelBind); i = maLabelBindMapper.insertMaLabelBindS(maLabelBind); - } + } return AjaxResult.success("绑定成功"); } @@ -93,8 +89,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService * @return 结果 */ @Override - public int updateMaLabelBind(MaLabelBindVO maLabelBind) - { + public int updateMaLabelBind(MaLabelBindVO maLabelBind) { return maLabelBindMapper.updateMaLabelBind(maLabelBind); } @@ -105,8 +100,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService * @return 结果 */ @Override - public int updateMaLabelBindByMaIds(Long id) - { + public int updateMaLabelBindByMaIds(Long id) { //Long ma=Long.parseLong(String.valueOf(maId)); return maLabelBindMapper.updateMaLabelBindByMaIds(id); } @@ -118,8 +112,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService * @return 结果 */ @Override - public int deleteMaLabelBindByMaId(Long maId) - { + public int deleteMaLabelBindByMaId(Long maId) { return maLabelBindMapper.deleteMaLabelBindByMaId(maId); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java index f7331948..231c70c2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java @@ -39,6 +39,10 @@ public class PurchaseMacodeInfo extends BaseEntity @ApiModelProperty(value = "二维码") private String qrCode; + /** rfid编号 */ + @ApiModelProperty(value = "rfid编号") + private String rfidCode; + /** 是否是固定资产编号 */ @ApiModelProperty(value = "是否是固定资产编号 0,是 1,否") private String fixCode; @@ -301,6 +305,14 @@ public class PurchaseMacodeInfo extends BaseEntity this.statusFlag = statusFlag; } + public String getRfidCode() { + return rfidCode; + } + + public void setRfidCode(String rfidCode) { + this.rfidCode = rfidCode; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index bf95a04e..287d564f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -95,6 +95,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService TmTask task = taskMapper.selectTmTaskByTaskId(taskId); Long typeId = purchaseMacodeInfo.getTypeId(); String maCode = purchaseMacodeInfo.getMaCode(); + String rfidCode = purchaseMacodeInfo.getRfidCode(); purchaseCheckDetails.setTypeId(typeId); purchaseCheckDetails.setTaskId(purchaseMacodeInfo.getTaskId()); @@ -117,6 +118,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService maMachine.setAssetsCode(purchaseMacodeInfo.getAssetsCode()); } maMachine.setMaCode(maCode); + maMachine.setRfidCode(rfidCode); maMachine.setCreateTime(new Date()); maMachine.setCreateBy(SecurityUtils.getUsername()); purchaseMacodeInfoMapper.maMachineAdd(maMachine);