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 1bc16bd8..d20a7cb2 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 @@ -123,19 +123,23 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService maMachine.setCreateBy(SecurityUtils.getUsername()); purchaseMacodeInfoMapper.maMachineAdd(maMachine); + // 标签绑定 maLabel.setIsBind("1"); - maLabel.setLabelCode(maCode); + maLabel.setLabelCode(qrCode); maLabel.setMaId(maMachine.getMaId()); maLabel.setCreateTime(new Date()); + maLabel.setLabelType(9L); purchaseMacodeInfoMapper.insertMaMachineLabel(maLabel); MaLabelBind maLabelBind = new MaLabelBind(); maLabelBind.setStatus("1"); maLabelBind.setIsBind("1"); + maLabelBind.setLabelCode(qrCode); maLabelBind.setMaId(maMachine.getMaId()); - maLabelBind.setTypeId(maLabelBind.getTypeId()); + maLabelBind.setTypeId(typeId); maLabelBind.setBindTime(new Date()); maLabelBind.setLabelType(9); + maLabelBind.setBinder(SecurityUtils.getUserId().toString()); purchaseMacodeInfoMapper.insertMaLabelBind(maLabelBind); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml index b2072ff6..693a1143 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml @@ -263,7 +263,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" binder, label_type, company_id, - binder_time, + bind_time, status, @@ -302,7 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"