From fa9ad0f28f381c4d471c8010d13b24416f8697db Mon Sep 17 00:00:00 2001 From: dingjie Date: Sat, 23 Dec 2023 20:52:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E7=BC=96=E7=A0=81=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api}/domain/MaLabelBind.java | 9 +++++-- .../sgzb/base/mapper/MaLabelBindMapper.java | 2 +- .../service/impl/MaMachineServiceImpl.java | 4 +-- .../resources/mapper/base/MaMachineMapper.xml | 2 +- .../mapper/PurchaseMacodeInfoMapper.java | 3 +++ .../impl/PurchaseMacodeInfoServiceImpl.java | 24 ++++++++++++------ .../material/PurchaseMacodeInfoMapper.xml | 25 ++++++++++++++++++- 7 files changed, 54 insertions(+), 15 deletions(-) rename {sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base => sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api}/domain/MaLabelBind.java (85%) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaLabelBind.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaLabelBind.java similarity index 85% rename from sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaLabelBind.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaLabelBind.java index 8ccf8ee8..07e52a93 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaLabelBind.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaLabelBind.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.base.domain; +package com.bonus.sgzb.base.api.domain; import com.bonus.sgzb.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -49,12 +49,17 @@ public class MaLabelBind { //标签类型(数据字典) @Excel(name = "标签类型(数据字典)") @ApiModelProperty(value = "种类id") - private Long labelType; + private Integer labelType; //数据所属组织 @Excel(name = "数据所属组织") @ApiModelProperty(value = "种类id") private String companyId; + //数据所属组织 + @Excel(name = "0已解绑 1已绑定") + @ApiModelProperty(value = "0已解绑 1已绑定") + private String status; + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java index 78477b80..7774e6bb 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java @@ -2,7 +2,7 @@ package com.bonus.sgzb.base.mapper; import java.util.List; import com.bonus.sgzb.base.api.domain.MaMachine; -import com.bonus.sgzb.base.domain.MaLabelBind; +import com.bonus.sgzb.base.api.domain.MaLabelBind; import com.bonus.sgzb.base.vo.MaLabelBindVO; import org.apache.ibatis.annotations.Mapper; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java index d39b0227..1d5649ff 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java @@ -2,16 +2,14 @@ package com.bonus.sgzb.base.service.impl; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaType; -import com.bonus.sgzb.base.domain.MaLabelBind; +import com.bonus.sgzb.base.api.domain.MaLabelBind; import com.bonus.sgzb.base.domain.MaPropSet; import com.bonus.sgzb.base.mapper.MaLabelBindMapper; import com.bonus.sgzb.base.mapper.MaMachineMapper; import com.bonus.sgzb.base.mapper.MaPropInfoMapper; import com.bonus.sgzb.base.mapper.MaTypeMapper; import com.bonus.sgzb.base.service.MaMachineService; -import com.bonus.sgzb.base.vo.MaLabelBindVO; import com.bonus.sgzb.common.security.utils.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml index 0772a381..7cf90029 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml @@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into ma_machine ( type_id, ma_code, diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java index 68fab2fd..f59dd9ef 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.mapper; import com.alibaba.fastjson.JSONObject; +import com.bonus.sgzb.base.api.domain.MaLabelBind; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaMachineLabel; import com.bonus.sgzb.base.api.domain.MaType; @@ -107,4 +108,6 @@ public interface PurchaseMacodeInfoMapper { int selectLableNumByMonth(Date nowDate); int insertMaMachineLabel(MaMachineLabel maMachineLabel); + + int insertMaLabelBind(MaLabelBind maLabelBind); } 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 17cadf5e..1bc16bd8 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 @@ -7,10 +7,7 @@ import java.util.Date; import java.util.List; import com.alibaba.fastjson.JSONObject; -import com.bonus.sgzb.base.api.domain.MaMachine; -import com.bonus.sgzb.base.api.domain.MaMachineLabel; -import com.bonus.sgzb.base.api.domain.MaType; -import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.base.api.domain.*; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; @@ -125,6 +122,22 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService maMachine.setCreateTime(new Date()); maMachine.setCreateBy(SecurityUtils.getUsername()); purchaseMacodeInfoMapper.maMachineAdd(maMachine); + + maLabel.setIsBind("1"); + maLabel.setLabelCode(maCode); + maLabel.setMaId(maMachine.getMaId()); + maLabel.setCreateTime(new Date()); + purchaseMacodeInfoMapper.insertMaMachineLabel(maLabel); + + MaLabelBind maLabelBind = new MaLabelBind(); + maLabelBind.setStatus("1"); + maLabelBind.setIsBind("1"); + maLabelBind.setMaId(maMachine.getMaId()); + maLabelBind.setTypeId(maLabelBind.getTypeId()); + maLabelBind.setBindTime(new Date()); + maLabelBind.setLabelType(9); + purchaseMacodeInfoMapper.insertMaLabelBind(maLabelBind); + } purchaseMacodeInfo.setStatus("0"); @@ -231,9 +244,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService }else { code = format + "-000" + lableNum; } - maMachineLabel.setIsBind("0"); - maMachineLabel.setLabelCode(code); - purchaseMacodeInfoMapper.insertMaMachineLabel(maMachineLabel); return code; } 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 b5cbd948..b2072ff6 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 @@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where assets_code = #{fixCode} - + insert into ma_machine ( type_id, ma_code, @@ -254,6 +254,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" now() + + insert into ma_label_bind + + ma_id, + label_code, + type_id, + binder, + label_type, + company_id, + binder_time, + status, + + + #{maId}, + #{labelCode}, + #{typeId}, + #{binder}, + #{labelType}, + #{companyId}, + #{bindTime}, + #{status}, + +