diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaInputRecord.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java similarity index 98% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaInputRecord.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java index 37571ef8..834764a1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaInputRecord.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java @@ -1,4 +1,4 @@ -package com.bonus.sgzb.material.domain; +package com.bonus.sgzb.base.api.domain; import java.math.BigDecimal; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/MaInputVO.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputVO.java similarity index 83% rename from sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/MaInputVO.java rename to sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputVO.java index 929445f1..9a22e383 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/MaInputVO.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputVO.java @@ -1,6 +1,6 @@ -package com.bonus.sgzb.material.vo; +package com.bonus.sgzb.base.api.domain; -import com.bonus.sgzb.material.domain.MaInputRecord; +import com.bonus.sgzb.base.api.domain.MaInputRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java index cb708a4d..ab151c1a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseAccessoryController.java @@ -8,7 +8,6 @@ import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.service.IPurchaseAccessoryService; -import com.bonus.sgzb.material.vo.MaInputVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index ce518a77..b3b403c8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -6,23 +6,17 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; -import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.service.PurchaseCheckServiceCenterService; -import com.bonus.sgzb.material.vo.MaInputVO; -import com.bonus.sgzb.material.vo.NoticeInfoVO; -import com.bonus.sgzb.system.api.domain.SysUser; -import com.bonus.sgzb.system.api.model.LoginUser; +import com.bonus.sgzb.base.api.domain.MaInputVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.List; /** diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java index c121bfdd..002e1c01 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java @@ -5,13 +5,9 @@ import javax.servlet.http.HttpServletResponse; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.material.domain.LeaseApplyInfo; -import com.bonus.sgzb.material.domain.MaInputRecord; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; -import com.bonus.sgzb.material.service.LeaseRecordService; -import com.bonus.sgzb.material.vo.EquipmentNumberVO; -import com.bonus.sgzb.material.vo.MaInputVO; +import com.bonus.sgzb.base.api.domain.MaInputVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java index 2f636c39..85253585 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java @@ -1,6 +1,6 @@ package com.bonus.sgzb.material.mapper; -import com.bonus.sgzb.material.domain.MaInputRecord; +import com.bonus.sgzb.base.api.domain.MaInputRecord; import com.bonus.sgzb.material.domain.PurchaseCheckDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java index 3eab08dd..e0877df7 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckServiceCenterMapper.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.material.mapper; +import com.bonus.sgzb.base.api.domain.MaInputRecord; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.material.domain.*; 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 e3d2b305..8f1ff139 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,10 +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; +import com.bonus.sgzb.base.api.domain.*; import com.bonus.sgzb.material.domain.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java index 6dd79771..219bbb2f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java @@ -2,10 +2,8 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.base.api.domain.MaMachineLabel; import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.material.domain.MaInputRecord; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; -import com.bonus.sgzb.material.vo.EquipmentNumberVO; -import com.bonus.sgzb.material.vo.MaInputVO; +import com.bonus.sgzb.base.api.domain.MaInputVO; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java index 139169b0..36708c5a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/PurchaseCheckServiceCenterService.java @@ -4,7 +4,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.domain.PurchaseMacodeInfo; -import com.bonus.sgzb.material.vo.MaInputVO; +import com.bonus.sgzb.base.api.domain.MaInputVO; import com.bonus.sgzb.material.vo.NoticeInfoVO; import java.util.List; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java index 588630fb..2f610e57 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java @@ -1,27 +1,23 @@ package com.bonus.sgzb.material.service.impl; -import com.bonus.sgzb.base.api.domain.MaMachine; -import com.bonus.sgzb.base.api.domain.MaType; +import com.bonus.sgzb.base.api.domain.MaInputRecord; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; -import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; import com.bonus.sgzb.material.mapper.PurchaseCheckServiceCenterMapper; import com.bonus.sgzb.material.mapper.TaskMapper; -import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.service.PurchaseCheckServiceCenterService; import com.bonus.sgzb.material.vo.GlobalContants; -import com.bonus.sgzb.material.vo.MaInputVO; +import com.bonus.sgzb.base.api.domain.MaInputVO; import com.bonus.sgzb.material.vo.NoticeInfoVO; import com.bonus.sgzb.system.api.RemoteUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; 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 901e0801..9e781a36 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 @@ -5,8 +5,6 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSONObject; import com.bonus.sgzb.base.api.domain.*; import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; @@ -17,9 +15,8 @@ import com.bonus.sgzb.material.mapper.*; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService; import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.material.vo.EquipmentNumberVO; import com.bonus.sgzb.material.vo.GlobalContants; -import com.bonus.sgzb.material.vo.MaInputVO; +import com.bonus.sgzb.base.api.domain.MaInputVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml index c2b1caff..674b8753 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml @@ -466,7 +466,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND type_id = #{typeId} AND `status` != '4' - select pmi.ma_code maCode, pcd.type_id typeId, 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 70615c26..445008b4 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 @@ -224,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(*) from purchase_check_details where task_id = #{taskId} and status ='1' - + insert into ma_input_record task_id,