基础信息管理后端

highway
A0010407 2 years ago
parent 9a62fbe233
commit c377584661

@ -89,6 +89,17 @@ public class ProRouteController extends BaseController {
return toAjax(proRouteService.insertProRoute(proRoute));
}
/**
*
*/
@RequiresPermissions("mes:pro:proroute:import")
@Log(title = "工艺路线", businessType = BusinessType.IMPORT)
@PostMapping("/import")
public AjaxResult importFile(@RequestBody ProRoute proRoute)
{
return toAjax(proRouteService.batchInsertProRoute(proRoute));
}
/**
* 线
*/

@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.mes.domain.ProRouteLine;
import com.op.mes.service.IProRouteLineService;
import com.op.mes.domain.ProRouteProduct;
import com.op.mes.service.IProRouteProductService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
@ -28,76 +28,76 @@ import com.op.common.core.web.page.TableDataInfo;
* @date 2023-07-13
*/
@RestController
@RequestMapping("/pro/routeprodline")
public class ProRouteLineController extends BaseController {
@RequestMapping("/pro/routeprodproduct")
public class ProRouteProductController extends BaseController {
@Autowired
private IProRouteLineService proRouteLineService;
private IProRouteProductService proRouteProductService;
/**
* 线
*/
//@RequiresPermissions("system:line:list")
//@RequiresPermissions("system:product:list")
@GetMapping("/list")
public TableDataInfo list(ProRouteLine proRouteLine) {
public TableDataInfo list(ProRouteProduct proRouteProduct) {
startPage();
List<ProRouteLine> list = proRouteLineService.selectProRouteLineList(proRouteLine);
List<ProRouteProduct> list = proRouteProductService.selectProRouteProductList(proRouteProduct);
return getDataTable(list);
}
/**
* 线
*/
//@RequiresPermissions("system:line:export")
//@RequiresPermissions("system:product:export")
@Log(title = "工艺线体关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ProRouteLine proRouteLine) {
List<ProRouteLine> list = proRouteLineService.selectProRouteLineList(proRouteLine);
ExcelUtil<ProRouteLine> util = new ExcelUtil<ProRouteLine>(ProRouteLine.class);
public void export(HttpServletResponse response, ProRouteProduct proRouteProduct) {
List<ProRouteProduct> list = proRouteProductService.selectProRouteProductList(proRouteProduct);
ExcelUtil<ProRouteProduct> util = new ExcelUtil<ProRouteProduct>(ProRouteProduct.class);
util.exportExcel(response, list, "工艺线体关联数据");
}
/**
* 线
*/
//@RequiresPermissions("system:line:query")
//@RequiresPermissions("system:product:query")
@GetMapping(value = "/{recordId}")
public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
return success(proRouteLineService.selectProRouteLineByRecordId(recordId));
return success(proRouteProductService.selectProRouteProductByRecordId(recordId));
}
/**
* 线
*/
//@RequiresPermissions("system:line:add")
//@RequiresPermissions("system:product:add")
@Log(title = "工艺线体关联", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ProRouteLine proRouteLine) {
return toAjax(proRouteLineService.insertProRouteLine(proRouteLine));
public AjaxResult add(@RequestBody ProRouteProduct proRouteProduct) {
return toAjax(proRouteProductService.insertProRouteProduct(proRouteProduct));
}
/**
* 线
*/
//@RequiresPermissions("system:line:edit")
//@RequiresPermissions("system:product:edit")
@Log(title = "工艺线体关联", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ProRouteLine proRouteLine) {
return toAjax(proRouteLineService.updateProRouteLine(proRouteLine));
public AjaxResult edit(@RequestBody ProRouteProduct proRouteProduct) {
return toAjax(proRouteProductService.updateProRouteProduct(proRouteProduct));
}
/**
* 线
*/
//@RequiresPermissions("system:line:remove")
//@RequiresPermissions("system:product:remove")
@Log(title = "工艺线体关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable String[] recordIds) {
return toAjax(proRouteLineService.deleteProRouteLineByRecordIds(recordIds));
return toAjax(proRouteProductService.deleteProRouteProductByRecordIds(recordIds));
}
/**穿梭框**/
@GetMapping("/getList")
public ProRouteLine getList(ProRouteLine proRouteLine) {
return proRouteLineService.getList(proRouteLine);
public ProRouteProduct getList(ProRouteProduct proRouteProduct) {
return proRouteProductService.getList(proRouteProduct);
}
}

@ -56,8 +56,18 @@ public class ProRoute extends BaseEntity
private String fileList;
private List<BaseFile> files;
private List<String> idList;
private String routeVersion;
public List<String> getIdList() {
return idList;
}
public void setIdList(List<String> idList) {
this.idList = idList;
}
public String getFileList() {
return fileList;
}

@ -8,12 +8,12 @@ import com.op.common.core.web.domain.BaseEntity;
import java.util.List;
/**
* 线 pro_route_line
* pro_route_product
*
* @author Open Platform
* @date 2023-07-13
*/
public class ProRouteLine extends BaseEntity {
public class ProRouteProduct extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 记录ID */
@ -23,16 +23,16 @@ public class ProRouteLine extends BaseEntity {
@Excel(name = "工艺路线ID")
private String routeId;
/** 线体ID */
@Excel(name = "线体ID")
/** 产品ID */
@Excel(name = "产品ID")
private String itemId;
/** 线体编码 */
@Excel(name = "线体编码")
/** 产品编码 */
@Excel(name = "产品编码")
private String itemCode;
/** 线体名称 */
@Excel(name = "线体名称")
/** 产品名称 */
@Excel(name = "产品名称")
private String itemName;
/** 预留字段1 */
@ -53,8 +53,8 @@ public class ProRouteLine extends BaseEntity {
private String key;
private String label;
private List<ProRouteLine> unSelect;
private List<ProRouteLine> selected;
private List<ProRouteProduct> unSelect;
private List<ProRouteProduct> selected;
private List<String> selectedValues;
public List<String> getSelectedValues() {
@ -65,19 +65,19 @@ public class ProRouteLine extends BaseEntity {
this.selectedValues = selectedValues;
}
public List<ProRouteLine> getUnSelect() {
public List<ProRouteProduct> getUnSelect() {
return unSelect;
}
public void setUnSelect(List<ProRouteLine> unSelect) {
public void setUnSelect(List<ProRouteProduct> unSelect) {
this.unSelect = unSelect;
}
public List<ProRouteLine> getSelected() {
public List<ProRouteProduct> getSelected() {
return selected;
}
public void setSelected(List<ProRouteLine> selected) {
public void setSelected(List<ProRouteProduct> selected) {
this.selected = selected;
}

@ -0,0 +1,68 @@
package com.op.mes.mapper;
import java.util.List;
import com.op.mes.domain.ProRouteProduct;
import org.apache.ibatis.annotations.Mapper;
/**
* Mapper
*
* @author Open Platform
* @date 2023-07-13
*/
@Mapper
public interface ProRouteProductMapper {
/**
*
*
* @param recordId
* @return
*/
public ProRouteProduct selectProRouteProductByRecordId(String recordId);
/**
*
*
* @param proRouteProduct
* @return
*/
public List<ProRouteProduct> selectProRouteProductList(ProRouteProduct proRouteProduct);
/**
*
*
* @param proRouteProduct
* @return
*/
public int insertProRouteProduct(ProRouteProduct proRouteProduct);
/**
*
*
* @param proRouteProduct
* @return
*/
public int updateProRouteProduct(ProRouteProduct proRouteProduct);
/**
*
*
* @param recordId
* @return
*/
public int deleteProRouteProductByRecordId(String recordId);
/**
*
*
* @param recordIds
* @return
*/
public int deleteProRouteProductByRecordIds(String[] recordIds);
public List<ProRouteProduct> getRouteProdProductListUndo(ProRouteProduct proRouteProduct);
List<ProRouteProduct> getRouteProdProductListDo(ProRouteProduct proRouteProduct);
void deleteByRouteId(ProRouteProduct proRouteProduct);
}

@ -1,7 +1,7 @@
package com.op.mes.service;
import java.util.List;
import com.op.mes.domain.ProRouteLine;
import com.op.mes.domain.ProRouteProduct;
/**
* 线Service
@ -9,38 +9,38 @@ import com.op.mes.domain.ProRouteLine;
* @author Open Platform
* @date 2023-07-13
*/
public interface IProRouteLineService {
public interface IProRouteProductService {
/**
* 线
*
* @param recordId 线
* @return 线
*/
public ProRouteLine selectProRouteLineByRecordId(String recordId);
public ProRouteProduct selectProRouteProductByRecordId(String recordId);
/**
* 线
*
* @param proRouteLine 线
* @param proRouteProduct 线
* @return 线
*/
public List<ProRouteLine> selectProRouteLineList(ProRouteLine proRouteLine);
public List<ProRouteProduct> selectProRouteProductList(ProRouteProduct proRouteProduct);
/**
* 线
*
* @param proRouteLine 线
* @param proRouteProduct 线
* @return
*/
public int insertProRouteLine(ProRouteLine proRouteLine);
public int insertProRouteProduct(ProRouteProduct proRouteProduct);
/**
* 线
*
* @param proRouteLine 线
* @param proRouteProduct 线
* @return
*/
public int updateProRouteLine(ProRouteLine proRouteLine);
public int updateProRouteProduct(ProRouteProduct proRouteProduct);
/**
* 线
@ -48,7 +48,7 @@ public interface IProRouteLineService {
* @param recordIds 线
* @return
*/
public int deleteProRouteLineByRecordIds(String[] recordIds);
public int deleteProRouteProductByRecordIds(String[] recordIds);
/**
* 线
@ -56,7 +56,7 @@ public interface IProRouteLineService {
* @param recordId 线
* @return
*/
public int deleteProRouteLineByRecordId(String recordId);
public int deleteProRouteProductByRecordId(String recordId);
ProRouteLine getList(ProRouteLine proRouteLine);
ProRouteProduct getList(ProRouteProduct proRouteProduct);
}

@ -68,4 +68,6 @@ public interface IProRouteService
* @return
*/
public int deleteProRouteByRouteId(String routeId);
public int batchInsertProRoute(ProRoute proRoute);
}

@ -0,0 +1,132 @@
package com.op.mes.service.impl;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.mes.mapper.ProRouteProductMapper;
import com.op.mes.domain.ProRouteProduct;
import com.op.mes.service.IProRouteProductService;
/**
* 线Service
*
* @author Open Platform
* @date 2023-07-13
*/
@Service
public class ProRouteProductServiceImpl implements IProRouteProductService {
@Autowired
private ProRouteProductMapper proRouteProductMapper;
/**
* 线
*
* @param recordId 线
* @return 线
*/
@Override
@DS("#header.poolName")
public ProRouteProduct selectProRouteProductByRecordId(String recordId) {
return proRouteProductMapper.selectProRouteProductByRecordId(recordId);
}
/**
* 线
*
* @param proRouteProduct 线
* @return 线
*/
@Override
@DS("#header.poolName")
public List<ProRouteProduct> selectProRouteProductList(ProRouteProduct proRouteProduct) {
return proRouteProductMapper.selectProRouteProductList(proRouteProduct);
}
/**
* 线
*
* @param proRouteProduct 线
* @return
*/
@Override
@DS("#header.poolName")
public int insertProRouteProduct(ProRouteProduct proRouteProduct) {
Date now = DateUtils.getNowDate();
if(StringUtils.isNotBlank(proRouteProduct.getRouteId())){
//删除之前的关联关系
proRouteProductMapper.deleteByRouteId(proRouteProduct);
}
if(proRouteProduct.getSelectedValues()!=null){
ProRouteProduct proRouteProductDto =null;
for(String ProductCode:proRouteProduct.getSelectedValues()){
//查询物料编码对应的各种信息
proRouteProductDto = new ProRouteProduct();
proRouteProductDto.setRecordId(IdUtils.fastSimpleUUID());
proRouteProductDto.setCreateTime(now);
proRouteProductDto.setCreateBy(SecurityUtils.getUsername());
proRouteProductDto.setRouteId(proRouteProduct.getRouteId());
proRouteProductDto.setItemId(proRouteProduct.getItemId());
proRouteProductDto.setItemCode(ProductCode);
proRouteProductDto.setItemName(proRouteProduct.getItemName());
proRouteProductMapper.insertProRouteProduct(proRouteProductDto);
}
}
//新增关联关系
return 1;
}
/**
* 线
*
* @param proRouteProduct 线
* @return
*/
@Override
@DS("#header.poolName")
public int updateProRouteProduct(ProRouteProduct proRouteProduct) {
proRouteProduct.setUpdateTime(DateUtils.getNowDate());
return proRouteProductMapper.updateProRouteProduct(proRouteProduct);
}
/**
* 线
*
* @param recordIds 线
* @return
*/
@Override
@DS("#header.poolName")
public int deleteProRouteProductByRecordIds(String[] recordIds) {
return proRouteProductMapper.deleteProRouteProductByRecordIds(recordIds);
}
/**
* 线
*
* @param recordId 线
* @return
*/
@Override
@DS("#header.poolName")
public int deleteProRouteProductByRecordId(String recordId) {
return proRouteProductMapper.deleteProRouteProductByRecordId(recordId);
}
@Override
@DS("#header.poolName")
public ProRouteProduct getList(ProRouteProduct proRouteProduct) {
ProRouteProduct dto = new ProRouteProduct();
List<ProRouteProduct> unSelected = proRouteProductMapper.getRouteProdProductListUndo(proRouteProduct);
dto.setUnSelect(unSelected);
List<ProRouteProduct> selected= proRouteProductMapper.getRouteProdProductListDo(proRouteProduct);
dto.setSelected(selected);
return dto;
}
}

@ -29,12 +29,12 @@ import org.springframework.util.CollectionUtils;
* @date 2022-05-12
*/
@Service
public class ProRouteServiceImpl implements IProRouteService
{
public class ProRouteServiceImpl implements IProRouteService {
@Autowired
private ProRouteMapper proRouteMapper;
@Autowired
private BaseFileMapper baseFileMapper;
/**
* 线
*
@ -43,12 +43,11 @@ public class ProRouteServiceImpl implements IProRouteService
*/
@Override
@DS("#header.poolName")
public ProRoute selectProRouteByRouteId(String routeId)
{
public ProRoute selectProRouteByRouteId(String routeId) {
ProRoute p = proRouteMapper.selectProRouteByRouteId(routeId);
List<BaseFile> files = baseFileMapper.getBaseFileBatch(routeId);
if(!CollectionUtils.isEmpty(files)){
List<BaseFile> files = baseFileMapper.getBaseFileBatch(routeId);
if (!CollectionUtils.isEmpty(files)) {
p.setFiles(files);
}
return p;
@ -62,8 +61,7 @@ public class ProRouteServiceImpl implements IProRouteService
*/
@Override
@DS("#header.poolName")
public List<ProRoute> selectProRouteList(ProRoute proRoute)
{
public List<ProRoute> selectProRouteList(ProRoute proRoute) {
return proRouteMapper.selectProRouteList(proRoute);
}
@ -78,7 +76,7 @@ public class ProRouteServiceImpl implements IProRouteService
public Boolean checkRouteCodeUnique(ProRoute proRoute) {
ProRoute route = proRouteMapper.checkRouteCodeUnique(proRoute);
String routeId = proRoute.getRouteId();
if(StringUtils.isNotNull(route) && !route.getRouteId().equals(routeId)){
if (StringUtils.isNotNull(route) && !route.getRouteId().equals(routeId)) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@ -92,16 +90,15 @@ public class ProRouteServiceImpl implements IProRouteService
*/
@Override
@DS("#header.poolName")
public int insertProRoute(ProRoute proRoute)
{
public int insertProRoute(ProRoute proRoute) {
proRoute.setCreateTime(DateUtils.getNowDate());
proRoute.setRouteVersion("V.1");
//上传附件
if(StringUtils.isNotEmpty(proRoute.getFileList())){
if (StringUtils.isNotEmpty(proRoute.getFileList())) {
String[] ids = proRoute.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for(String id:ids){
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(id.split("&fileName=")[1]);
@ -125,17 +122,15 @@ public class ProRouteServiceImpl implements IProRouteService
*/
@Override
@DS("#header.poolName")
public int updateProRoute(ProRoute proRoute)
{
public int updateProRoute(ProRoute proRoute) {
proRoute.setUpdateTime(DateUtils.getNowDate());
//上传附件
if(StringUtils.isNotEmpty(proRoute.getFileList())){
if (StringUtils.isNotEmpty(proRoute.getFileList())) {
baseFileMapper.deleteBaseFileBySourceId(proRoute.getRouteId());
String[] ids = proRoute.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for(String id:ids){
for (String id : ids) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileAddress(id);
@ -149,10 +144,10 @@ public class ProRouteServiceImpl implements IProRouteService
}
//更新版本V.1->递增
String nowRouteVersion = proRoute.getRouteVersion().replace("V","")
.replace(".","");
String nowRouteVersion = proRoute.getRouteVersion().replace("V", "")
.replace(".", "");
int nowRouteVersionNum = Integer.parseInt(nowRouteVersion);
String newRouteVersionNum = "V."+(++nowRouteVersionNum);
String newRouteVersionNum = "V." + (++nowRouteVersionNum);
proRoute.setRouteVersion(newRouteVersionNum);
return proRouteMapper.updateProRoute(proRoute);
}
@ -165,8 +160,7 @@ public class ProRouteServiceImpl implements IProRouteService
*/
@Override
@DS("#header.poolName")
public int deleteProRouteByRouteIds(String[] routeIds)
{
public int deleteProRouteByRouteIds(String[] routeIds) {
return proRouteMapper.deleteProRouteByRouteIds(routeIds);
}
@ -178,9 +172,34 @@ public class ProRouteServiceImpl implements IProRouteService
*/
@Override
@DS("#header.poolName")
public int deleteProRouteByRouteId(String routeId)
{
public int deleteProRouteByRouteId(String routeId) {
return proRouteMapper.deleteProRouteByRouteId(routeId);
}
@Override
@DS("#header.poolName")
public int batchInsertProRoute(ProRoute proRoute) {
proRoute.setCreateTime(DateUtils.getNowDate());
if (StringUtils.isNotEmpty(proRoute.getFileList())) {
List<String> ids = proRoute.getIdList();
// for (int j = ids.size(); j < 1; j--) {
for (String id :ids) {
String[] f = proRoute.getFileList().split(",");
List<BaseFileData> files = new ArrayList<>();
BaseFileData file = null;
for (String file1 : f) {
file = new BaseFileData();
file.setFileId(IdUtils.fastSimpleUUID());
file.setFileName(file1.split("&fileName=")[1]);
file.setFileAddress(file1);
file.setSourceId(id);
file.setCreateBy(SecurityUtils.getUsername());
file.setCreateTime(new Date());
files.add(file);
}
baseFileMapper.insertBaseFileBatch(files);
}
}
return 1;
}
}

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.mes.mapper.ProRouteLineMapper">
<mapper namespace="com.op.mes.mapper.ProRouteProductMapper">
<resultMap type="ProRouteLine" id="ProRouteLineResult">
<resultMap type="ProRouteProduct" id="ProRouteProductResult">
<result property="recordId" column="record_id" />
<result property="routeId" column="route_id" />
<result property="itemId" column="item_id" />
@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectProRouteLineVo">
select record_id, route_id, item_id, item_code, item_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_line
<sql id="selectProRouteProductVo">
select record_id, route_id, item_id, item_code, item_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product
</sql>
<select id="selectProRouteLineList" parameterType="ProRouteLine" resultMap="ProRouteLineResult">
<include refid="selectProRouteLineVo"/>
<select id="selectProRouteProductList" parameterType="ProRouteProduct" resultMap="ProRouteProductResult">
<include refid="selectProRouteProductVo"/>
<where>
<if test="routeId != null and routeId != ''"> and route_id = #{routeId}</if>
<if test="itemId != null and itemId != ''"> and item_id = #{itemId}</if>
@ -39,26 +39,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectProRouteLineByRecordId" parameterType="String" resultMap="ProRouteLineResult">
<include refid="selectProRouteLineVo"/>
<select id="selectProRouteProductByRecordId" parameterType="String" resultMap="ProRouteProductResult">
<include refid="selectProRouteProductVo"/>
where record_id = #{recordId}
</select>
<select id="getRouteProdLineListUndo" resultType="com.op.mes.domain.ProRouteLine">
select sf.f_code [key],
sf.factory_name label
from sys_factory sf
where sf.f_type='l' and sf.status = '1' and sf.del_flag = '0'
<!-- 原来逻辑:关联工厂里面的线体-->
<!-- <select id="getRouteProdProductListUndo" resultType="com.op.mes.domain.ProRouteProduct">-->
<!-- select sf.f_code [key],-->
<!-- sf.factory_name label-->
<!-- from sys_factory sf-->
<!-- where sf.f_type='l' and sf.status = '1' and sf.del_flag = '0'-->
<!-- </select>-->
<!-- 现在逻辑:关联产品-->
<select id="getRouteProdProductListUndo" resultType="com.op.mes.domain.ProRouteProduct">
select bp.product_code [key],
bp.product_desc_zh label,
bp.product_desc_zh itemName,
bp.product_id itemId
from base_product bp
where bp.active_flag = '1' and bp.del_flag = '0'
</select>
<select id="getRouteProdLineListDo" resultType="com.op.mes.domain.ProRouteLine">
select pl.item_code [key],
sf.factory_name label
from pro_route_line pl
left join sys_factory sf on pl.item_code = sf.f_code
where pl.route_id = #{routeId}
<!-- <select id="getRouteProdProductListDo" resultType="com.op.mes.domain.ProRouteProduct">-->
<!-- select pl.item_code [key],-->
<!-- sf.factory_name label-->
<!-- from pro_route_product pl-->
<!-- left join sys_factory sf on pl.item_code = sf.f_code-->
<!-- where pl.route_id = #{routeId}-->
<!-- </select>-->
<select id="getRouteProdProductListDo" resultType="com.op.mes.domain.ProRouteProduct">
select pp.item_code [key],
bp.product_desc_zh label
from pro_route_product pp
left join base_product bp on pp.item_code = bp.product_code
where pp.route_id = #{routeId}
</select>
<insert id="insertProRouteLine" parameterType="ProRouteLine">
insert into pro_route_line
<insert id="insertProRouteProduct" parameterType="ProRouteProduct">
insert into pro_route_product
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordId != null">record_id,</if>
<if test="routeId != null and routeId != ''">route_id,</if>
@ -93,8 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateProRouteLine" parameterType="ProRouteLine">
update pro_route_line
<update id="updateProRouteProduct" parameterType="ProRouteProduct">
update pro_route_product
<trim prefix="SET" suffixOverrides=",">
<if test="routeId != null and routeId != ''">route_id = #{routeId},</if>
<if test="itemId != null and itemId != ''">item_id = #{itemId},</if>
@ -113,17 +132,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where record_id = #{recordId}
</update>
<delete id="deleteProRouteLineByRecordId" parameterType="String">
delete from pro_route_line where record_id = #{recordId}
<delete id="deleteProRouteProductByRecordId" parameterType="String">
delete from pro_route_product where record_id = #{recordId}
</delete>
<delete id="deleteProRouteLineByRecordIds" parameterType="String">
delete from pro_route_line where record_id in
<delete id="deleteProRouteProductByRecordIds" parameterType="String">
delete from pro_route_product where record_id in
<foreach item="recordId" collection="array" open="(" separator="," close=")">
#{recordId}
</foreach>
</delete>
<delete id="deleteByRouteId">
delete from pro_route_line where route_id = #{routeId}
delete from pro_route_product where route_id = #{routeId}
</delete>
</mapper>

@ -19,7 +19,6 @@ import com.op.wms.service.IBaseBomItemsTService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* BOMController
@ -38,10 +37,9 @@ public class BaseBomItemsTController extends BaseController {
*/
@RequiresPermissions("wms:bom:list")
@GetMapping("/list")
public TableDataInfo list(BaseBomItemsT baseBomItemsT) {
startPage();
public AjaxResult list(BaseBomItemsT baseBomItemsT) {
List<BaseBomItemsT> list = baseBomItemsTService.selectBaseBomItemsTList(baseBomItemsT);
return getDataTable(list);
return success(list);
}
/**

@ -0,0 +1,97 @@
package com.op.wms.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.wms.domain.BaseEquipment;
import com.op.wms.service.IBaseEquipmentService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* Controller
*
* @author Open Platform
* @date 2023-07-20
*/
@RestController
@RequestMapping("/equipment")
public class BaseEquipmentController extends BaseController {
@Autowired
private IBaseEquipmentService baseEquipmentService;
/**
*
*/
@RequiresPermissions("wms:equipment:list")
@GetMapping("/list")
public TableDataInfo list(BaseEquipment baseEquipment) {
startPage();
List<BaseEquipment> list = baseEquipmentService.selectBaseEquipmentList(baseEquipment);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("wms:equipment:export")
@Log(title = "设备管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseEquipment baseEquipment) {
List<BaseEquipment> list = baseEquipmentService.selectBaseEquipmentList(baseEquipment);
ExcelUtil<BaseEquipment> util = new ExcelUtil<BaseEquipment>(BaseEquipment.class);
util.exportExcel(response, list, "设备管理数据");
}
/**
*
*/
@RequiresPermissions("wms:equipment:query")
@GetMapping(value = "/{equipmentId}")
public AjaxResult getInfo(@PathVariable("equipmentId") Long equipmentId) {
return success(baseEquipmentService.selectBaseEquipmentByEquipmentId(equipmentId));
}
/**
*
*/
@RequiresPermissions("wms:equipment:add")
@Log(title = "设备管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseEquipment baseEquipment) {
return toAjax(baseEquipmentService.insertBaseEquipment(baseEquipment));
}
/**
*
*/
@RequiresPermissions("wms:equipment:edit")
@Log(title = "设备管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseEquipment baseEquipment) {
return toAjax(baseEquipmentService.updateBaseEquipment(baseEquipment));
}
/**
*
*/
@RequiresPermissions("wms:equipment:remove")
@Log(title = "设备管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{equipmentIds}")
public AjaxResult remove(@PathVariable Long[] equipmentIds) {
return toAjax(baseEquipmentService.deleteBaseEquipmentByEquipmentIds(equipmentIds));
}
}

@ -0,0 +1,97 @@
package com.op.wms.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.wms.domain.BaseEquipmentProduct;
import com.op.wms.service.IBaseEquipmentProductService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
/**
* Controller
*
* @author Open Platform
* @date 2023-07-20
*/
@RestController
@RequestMapping("/equipmentBoundMaterials")
public class BaseEquipmentProductController extends BaseController {
@Autowired
private IBaseEquipmentProductService baseEquipmentProductService;
/**
*
*/
@RequiresPermissions("wms:equipmentBoundMaterials:list")
@GetMapping("/list")
public TableDataInfo list(BaseEquipmentProduct baseEquipmentProduct) {
startPage();
List<BaseEquipmentProduct> list = baseEquipmentProductService.selectBaseEquipmentProductList(baseEquipmentProduct);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("wms:equipmentBoundMaterials:export")
@Log(title = "设备绑定产品", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BaseEquipmentProduct baseEquipmentProduct) {
List<BaseEquipmentProduct> list = baseEquipmentProductService.selectBaseEquipmentProductList(baseEquipmentProduct);
ExcelUtil<BaseEquipmentProduct> util = new ExcelUtil<BaseEquipmentProduct>(BaseEquipmentProduct.class);
util.exportExcel(response, list, "设备绑定产品数据");
}
/**
*
*/
@RequiresPermissions("wms:equipmentBoundMaterials:query")
@GetMapping(value = "/{equipmentId}")
public AjaxResult getInfo(@PathVariable("equipmentId") Long equipmentId) {
return success(baseEquipmentProductService.selectBaseEquipmentProductByEquipmentId(equipmentId));
}
/**
*
*/
@RequiresPermissions("wms:equipmentBoundMaterials:add")
@Log(title = "设备绑定产品", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BaseEquipmentProduct baseEquipmentProduct) {
return toAjax(baseEquipmentProductService.insertBaseEquipmentProduct(baseEquipmentProduct));
}
/**
*
*/
@RequiresPermissions("wms:equipmentBoundMaterials:edit")
@Log(title = "设备绑定产品", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody BaseEquipmentProduct baseEquipmentProduct) {
return toAjax(baseEquipmentProductService.updateBaseEquipmentProduct(baseEquipmentProduct));
}
/**
*
*/
@RequiresPermissions("wms:equipmentBoundMaterials:remove")
@Log(title = "设备绑定产品", businessType = BusinessType.DELETE)
@DeleteMapping("/{equipmentIds}")
public AjaxResult remove(@PathVariable Long[] equipmentIds) {
return toAjax(baseEquipmentProductService.deleteBaseEquipmentProductByEquipmentIds(equipmentIds));
}
}

@ -3,7 +3,7 @@ package com.op.wms.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
import com.op.common.core.web.domain.TreeEntity;
/**
* BOM base_bom_items_t
@ -11,7 +11,7 @@ import com.op.common.core.web.domain.BaseEntity;
* @author Open Platform
* @date 2023-07-18
*/
public class BaseBomItemsT extends BaseEntity {
public class BaseBomItemsT extends TreeEntity {
private static final long serialVersionUID = 1L;
/** BOM配方组成主键 */

@ -0,0 +1,267 @@
package com.op.wms.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* base_equipment
*
* @author Open Platform
* @date 2023-07-20
*/
public class BaseEquipment extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 设备类型ID */
private Long equipmentId;
/** 设备类型编码 */
@Excel(name = "设备类型编码")
private String equipmentCode;
/** 设备类型名称 */
@Excel(name = "设备类型名称")
private String equipmentName;
/** 品牌 */
@Excel(name = "品牌")
private String equipmentBrand;
/** 规格型号 */
@Excel(name = "规格型号")
private String equipmentSpec;
/** 设备类型ID */
@Excel(name = "设备类型ID")
private Long equipmentTypeId;
/** 设备类型编码 */
@Excel(name = "设备类型编码")
private String equipmentTypeCode;
/** 设备类型名称 */
@Excel(name = "设备类型名称")
private String equipmentTypeName;
/** 所属车间ID */
@Excel(name = "所属车间ID")
private Long workshopId;
/** 所属车间编码 */
@Excel(name = "所属车间编码")
private String workshopCode;
/** 所属车间名称 */
@Excel(name = "所属车间名称")
private String workshopName;
/** 设备状态 */
@Excel(name = "设备状态")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private Long attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private Long attr4;
/** 单台能力工时 */
// @Excel(name = "单台能力工时")
// private String unitWorkingHours;
/** 工段 */
@Excel(name = "工段")
private String workshopSection;
/** 设备位置 */
@Excel(name = "设备位置")
private String equipmentLocation;
/** 工时单价 */
@Excel(name = "工时单价")
private String hourlyUnitPrice;
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
public Long getEquipmentId() {
return equipmentId;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentBrand(String equipmentBrand) {
this.equipmentBrand = equipmentBrand;
}
public String getEquipmentBrand() {
return equipmentBrand;
}
public void setEquipmentSpec(String equipmentSpec) {
this.equipmentSpec = equipmentSpec;
}
public String getEquipmentSpec() {
return equipmentSpec;
}
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
public void setEquipmentTypeCode(String equipmentTypeCode) {
this.equipmentTypeCode = equipmentTypeCode;
}
public String getEquipmentTypeCode() {
return equipmentTypeCode;
}
public void setEquipmentTypeName(String equipmentTypeName) {
this.equipmentTypeName = equipmentTypeName;
}
public String getEquipmentTypeName() {
return equipmentTypeName;
}
public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
public Long getWorkshopId() {
return workshopId;
}
public void setWorkshopCode(String workshopCode) {
this.workshopCode = workshopCode;
}
public String getWorkshopCode() {
return workshopCode;
}
public void setWorkshopName(String workshopName) {
this.workshopName = workshopName;
}
public String getWorkshopName() {
return workshopName;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(Long attr3) {
this.attr3 = attr3;
}
public Long getAttr3() {
return attr3;
}
public void setAttr4(Long attr4) {
this.attr4 = attr4;
}
public Long getAttr4() {
return attr4;
}
// public void setUnitWorkingHours(String unitWorkingHours) {
// this.unitWorkingHours = unitWorkingHours;
// }
//
// public String getUnitWorkingHours() {
// return unitWorkingHours;
// }
public void setWorkshopSection(String workshopSection) {
this.workshopSection = workshopSection;
}
public String getWorkshopSection() {
return workshopSection;
}
public void setEquipmentLocation(String equipmentLocation) {
this.equipmentLocation = equipmentLocation;
}
public String getEquipmentLocation() {
return equipmentLocation;
}
public void setHourlyUnitPrice(String hourlyUnitPrice) {
this.hourlyUnitPrice = hourlyUnitPrice;
}
public String getHourlyUnitPrice() {
return hourlyUnitPrice;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("equipmentId", getEquipmentId())
.append("equipmentCode", getEquipmentCode())
.append("equipmentName", getEquipmentName())
.append("equipmentBrand", getEquipmentBrand())
.append("equipmentSpec", getEquipmentSpec())
.append("equipmentTypeId", getEquipmentTypeId())
.append("equipmentTypeCode", getEquipmentTypeCode())
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopId", getWorkshopId())
.append("workshopCode", getWorkshopCode())
.append("workshopName", getWorkshopName())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
// .append("unitWorkingHours", getUnitWorkingHours())
.append("workshopSection", getWorkshopSection())
.append("equipmentLocation", getEquipmentLocation())
.append("hourlyUnitPrice", getHourlyUnitPrice())
.toString();
}
}

@ -0,0 +1,219 @@
package com.op.wms.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* base_equipment_product
*
* @author Open Platform
* @date 2023-07-20
*/
public class BaseEquipmentProduct extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 设备ID */
private Long equipmentId;
/** 设备编码 */
@Excel(name = "设备编码")
private String equipmentCode;
/** 设备名称 */
@Excel(name = "设备名称")
private String equipmentName;
/** 产品编码 */
@Excel(name = "产品编码")
private String productCode;
/** 产品名称 */
@Excel(name = "产品名称")
private String productDescZh;
/** 设备类型ID */
@Excel(name = "设备类型ID")
private Long equipmentTypeId;
/** 设备类型编码 */
@Excel(name = "设备类型编码")
private String equipmentTypeCode;
/** 设备类型名称 */
@Excel(name = "设备类型名称")
private String equipmentTypeName;
/** 所属车间ID */
@Excel(name = "所属车间ID")
private Long workshopId;
/** 所属车间编码 */
@Excel(name = "所属车间编码")
private String workshopCode;
/** 所属车间名称 */
@Excel(name = "所属车间名称")
private String workshopName;
/** 设备状态 */
@Excel(name = "设备状态")
private String status;
/** 预留字段1 */
@Excel(name = "预留字段1")
private String attr1;
/** 预留字段2 */
@Excel(name = "预留字段2")
private String attr2;
/** 预留字段3 */
@Excel(name = "预留字段3")
private Long attr3;
/** 预留字段4 */
@Excel(name = "预留字段4")
private Long attr4;
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
public Long getEquipmentId() {
return equipmentId;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getEquipmentName() {
return equipmentName;
}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
public String getProductCode() {
return productCode;
}
public void setProductDescZh(String productDescZh) {
this.productDescZh = productDescZh;
}
public String getProductDescZh() {
return productDescZh;
}
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
public void setEquipmentTypeCode(String equipmentTypeCode) {
this.equipmentTypeCode = equipmentTypeCode;
}
public String getEquipmentTypeCode() {
return equipmentTypeCode;
}
public void setEquipmentTypeName(String equipmentTypeName) {
this.equipmentTypeName = equipmentTypeName;
}
public String getEquipmentTypeName() {
return equipmentTypeName;
}
public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
public Long getWorkshopId() {
return workshopId;
}
public void setWorkshopCode(String workshopCode) {
this.workshopCode = workshopCode;
}
public String getWorkshopCode() {
return workshopCode;
}
public void setWorkshopName(String workshopName) {
this.workshopName = workshopName;
}
public String getWorkshopName() {
return workshopName;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
public String getAttr1() {
return attr1;
}
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
public String getAttr2() {
return attr2;
}
public void setAttr3(Long attr3) {
this.attr3 = attr3;
}
public Long getAttr3() {
return attr3;
}
public void setAttr4(Long attr4) {
this.attr4 = attr4;
}
public Long getAttr4() {
return attr4;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("equipmentId", getEquipmentId())
.append("equipmentCode", getEquipmentCode())
.append("equipmentName", getEquipmentName())
.append("productCode", getProductCode())
.append("productDescZh", getProductDescZh())
.append("equipmentTypeId", getEquipmentTypeId())
.append("equipmentTypeCode", getEquipmentTypeCode())
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopId", getWorkshopId())
.append("workshopCode", getWorkshopCode())
.append("workshopName", getWorkshopName())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}

@ -7,9 +7,9 @@ import com.op.common.core.annotation.Excel;
import com.op.common.core.web.domain.BaseEntity;
/**
* base_product
* base_product
*
* @author Open Platform
* @author JGY
* @date 2023-07-18
*/
public class BaseProduct extends BaseEntity {
@ -18,14 +18,18 @@ public class BaseProduct extends BaseEntity {
/** 主键ID */
private String productId;
/** 产品代码 */
@Excel(name = "产品代码")
/** 物料编码 */
@Excel(name = "物料编码")
private String productCode;
/** 中文描述 */
@Excel(name = "中文描述")
/** 物料名称 */
@Excel(name = "物料名称")
private String productDescZh;
/** 物料名称 */
@Excel(name = "物料型号")
private String productModel;
/** 英文描述 */
@Excel(name = "英文描述")
private String productDescEn;
@ -78,8 +82,8 @@ public class BaseProduct extends BaseEntity {
@Excel(name = "单价")
private BigDecimal unitPrice;
/** 产品组 */
@Excel(name = "产品组")
/** 物料组 */
@Excel(name = "物料类别组")
private String productGroup;
/** $column.columnComment */
@ -164,10 +168,9 @@ public class BaseProduct extends BaseEntity {
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductId() {
return productId;
}
return productId;}
public void setProductCode(String productCode) {
this.productCode = productCode;
}
@ -182,6 +185,14 @@ public class BaseProduct extends BaseEntity {
public String getProductDescZh() {
return productDescZh;
}
public void setProductModel(String productModel) {
this.productModel = productModel;
}
public String getProductModel() {
return productModel;
}
public void setProductDescEn(String productDescEn) {
this.productDescEn = productDescEn;
}

@ -0,0 +1,61 @@
package com.op.wms.mapper;
import java.util.List;
import com.op.wms.domain.BaseEquipment;
/**
* Mapper
*
* @author Open Platform
* @date 2023-07-20
*/
public interface BaseEquipmentMapper {
/**
*
*
* @param equipmentId
* @return
*/
public BaseEquipment selectBaseEquipmentByEquipmentId(Long equipmentId);
/**
*
*
* @param baseEquipment
* @return
*/
public List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment);
/**
*
*
* @param baseEquipment
* @return
*/
public int insertBaseEquipment(BaseEquipment baseEquipment);
/**
*
*
* @param baseEquipment
* @return
*/
public int updateBaseEquipment(BaseEquipment baseEquipment);
/**
*
*
* @param equipmentId
* @return
*/
public int deleteBaseEquipmentByEquipmentId(Long equipmentId);
/**
*
*
* @param equipmentIds
* @return
*/
public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds);
}

@ -0,0 +1,61 @@
package com.op.wms.mapper;
import java.util.List;
import com.op.wms.domain.BaseEquipmentProduct;
/**
* Mapper
*
* @author Open Platform
* @date 2023-07-20
*/
public interface BaseEquipmentProductMapper {
/**
*
*
* @param equipmentId
* @return
*/
public BaseEquipmentProduct selectBaseEquipmentProductByEquipmentId(Long equipmentId);
/**
*
*
* @param baseEquipmentProduct
* @return
*/
public List<BaseEquipmentProduct> selectBaseEquipmentProductList(BaseEquipmentProduct baseEquipmentProduct);
/**
*
*
* @param baseEquipmentProduct
* @return
*/
public int insertBaseEquipmentProduct(BaseEquipmentProduct baseEquipmentProduct);
/**
*
*
* @param baseEquipmentProduct
* @return
*/
public int updateBaseEquipmentProduct(BaseEquipmentProduct baseEquipmentProduct);
/**
*
*
* @param equipmentId
* @return
*/
public int deleteBaseEquipmentProductByEquipmentId(Long equipmentId);
/**
*
*
* @param equipmentIds
* @return
*/
public int deleteBaseEquipmentProductByEquipmentIds(Long[] equipmentIds);
}

@ -1,5 +1,6 @@
package com.op.wms.mapper;
import java.util.Date;
import java.util.List;
import com.op.wms.domain.BaseShiftsT;
@ -58,4 +59,8 @@ public interface BaseShiftsTMapper {
* @return
*/
public int deleteBaseShiftsTByShiftIds(String[] shiftIds);
List<Date> queryAllStartTime(BaseShiftsT baseShiftsT);
List<Date> queryAllEndTime(BaseShiftsT baseShiftsT);
}

@ -0,0 +1,60 @@
package com.op.wms.service;
import java.util.List;
import com.op.wms.domain.BaseEquipmentProduct;
/**
* Service
*
* @author Open Platform
* @date 2023-07-20
*/
public interface IBaseEquipmentProductService {
/**
*
*
* @param equipmentId
* @return
*/
public BaseEquipmentProduct selectBaseEquipmentProductByEquipmentId(Long equipmentId);
/**
*
*
* @param baseEquipmentProduct
* @return
*/
public List<BaseEquipmentProduct> selectBaseEquipmentProductList(BaseEquipmentProduct baseEquipmentProduct);
/**
*
*
* @param baseEquipmentProduct
* @return
*/
public int insertBaseEquipmentProduct(BaseEquipmentProduct baseEquipmentProduct);
/**
*
*
* @param baseEquipmentProduct
* @return
*/
public int updateBaseEquipmentProduct(BaseEquipmentProduct baseEquipmentProduct);
/**
*
*
* @param equipmentIds
* @return
*/
public int deleteBaseEquipmentProductByEquipmentIds(Long[] equipmentIds);
/**
*
*
* @param equipmentId
* @return
*/
public int deleteBaseEquipmentProductByEquipmentId(Long equipmentId);
}

@ -0,0 +1,60 @@
package com.op.wms.service;
import java.util.List;
import com.op.wms.domain.BaseEquipment;
/**
* Service
*
* @author Open Platform
* @date 2023-07-20
*/
public interface IBaseEquipmentService {
/**
*
*
* @param equipmentId
* @return
*/
public BaseEquipment selectBaseEquipmentByEquipmentId(Long equipmentId);
/**
*
*
* @param baseEquipment
* @return
*/
public List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment);
/**
*
*
* @param baseEquipment
* @return
*/
public int insertBaseEquipment(BaseEquipment baseEquipment);
/**
*
*
* @param baseEquipment
* @return
*/
public int updateBaseEquipment(BaseEquipment baseEquipment);
/**
*
*
* @param equipmentIds
* @return
*/
public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds);
/**
*
*
* @param equipmentId
* @return
*/
public int deleteBaseEquipmentByEquipmentId(Long equipmentId);
}

@ -73,6 +73,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
@DS("#header.poolName")
public int updateBaseArea(BaseArea baseArea) {
baseArea.setUpdateTime(DateUtils.getNowDate());
baseArea.setUpdateBy(SecurityUtils.getUsername());
return baseAreaMapper.updateBaseArea(baseArea);
}

@ -0,0 +1,97 @@
package com.op.wms.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.BaseEquipmentProductMapper;
import com.op.wms.domain.BaseEquipmentProduct;
import com.op.wms.service.IBaseEquipmentProductService;
/**
* Service
*
* @author Open Platform
* @date 2023-07-20
*/
@Service
public class BaseEquipmentProductServiceImpl implements IBaseEquipmentProductService {
@Autowired
private BaseEquipmentProductMapper baseEquipmentProductMapper;
/**
*
*
* @param equipmentId
* @return
*/
@Override
@DS("#header.poolName")
public BaseEquipmentProduct selectBaseEquipmentProductByEquipmentId(Long equipmentId) {
return baseEquipmentProductMapper.selectBaseEquipmentProductByEquipmentId(equipmentId);
}
/**
*
*
* @param baseEquipmentProduct
* @return
*/
@Override
@DS("#header.poolName")
public List<BaseEquipmentProduct> selectBaseEquipmentProductList(BaseEquipmentProduct baseEquipmentProduct) {
return baseEquipmentProductMapper.selectBaseEquipmentProductList(baseEquipmentProduct);
}
/**
*
*
* @param baseEquipmentProduct
* @return
*/
@Override
@DS("#header.poolName")
public int insertBaseEquipmentProduct(BaseEquipmentProduct baseEquipmentProduct) {
baseEquipmentProduct.setCreateTime(DateUtils.getNowDate());
return baseEquipmentProductMapper.insertBaseEquipmentProduct(baseEquipmentProduct);
}
/**
*
*
* @param baseEquipmentProduct
* @return
*/
@Override
@DS("#header.poolName")
public int updateBaseEquipmentProduct(BaseEquipmentProduct baseEquipmentProduct) {
baseEquipmentProduct.setUpdateTime(DateUtils.getNowDate());
return baseEquipmentProductMapper.updateBaseEquipmentProduct(baseEquipmentProduct);
}
/**
*
*
* @param equipmentIds
* @return
*/
@Override
@DS("#header.poolName")
public int deleteBaseEquipmentProductByEquipmentIds(Long[] equipmentIds) {
return baseEquipmentProductMapper.deleteBaseEquipmentProductByEquipmentIds(equipmentIds);
}
/**
*
*
* @param equipmentId
* @return
*/
@Override
@DS("#header.poolName")
public int deleteBaseEquipmentProductByEquipmentId(Long equipmentId) {
return baseEquipmentProductMapper.deleteBaseEquipmentProductByEquipmentId(equipmentId);
}
}

@ -0,0 +1,97 @@
package com.op.wms.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.BaseEquipmentMapper;
import com.op.wms.domain.BaseEquipment;
import com.op.wms.service.IBaseEquipmentService;
/**
* Service
*
* @author Open Platform
* @date 2023-07-20
*/
@Service
public class BaseEquipmentServiceImpl implements IBaseEquipmentService {
@Autowired
private BaseEquipmentMapper baseEquipmentMapper;
/**
*
*
* @param equipmentId
* @return
*/
@Override
@DS("#header.poolName")
public BaseEquipment selectBaseEquipmentByEquipmentId(Long equipmentId) {
return baseEquipmentMapper.selectBaseEquipmentByEquipmentId(equipmentId);
}
/**
*
*
* @param baseEquipment
* @return
*/
@Override
@DS("#header.poolName")
public List<BaseEquipment> selectBaseEquipmentList(BaseEquipment baseEquipment) {
return baseEquipmentMapper.selectBaseEquipmentList(baseEquipment);
}
/**
*
*
* @param baseEquipment
* @return
*/
@Override
@DS("#header.poolName")
public int insertBaseEquipment(BaseEquipment baseEquipment) {
baseEquipment.setCreateTime(DateUtils.getNowDate());
return baseEquipmentMapper.insertBaseEquipment(baseEquipment);
}
/**
*
*
* @param baseEquipment
* @return
*/
@Override
@DS("#header.poolName")
public int updateBaseEquipment(BaseEquipment baseEquipment) {
baseEquipment.setUpdateTime(DateUtils.getNowDate());
return baseEquipmentMapper.updateBaseEquipment(baseEquipment);
}
/**
*
*
* @param equipmentIds
* @return
*/
@Override
@DS("#header.poolName")
public int deleteBaseEquipmentByEquipmentIds(Long[] equipmentIds) {
return baseEquipmentMapper.deleteBaseEquipmentByEquipmentIds(equipmentIds);
}
/**
*
*
* @param equipmentId
* @return
*/
@Override
@DS("#header.poolName")
public int deleteBaseEquipmentByEquipmentId(Long equipmentId) {
return baseEquipmentMapper.deleteBaseEquipmentByEquipmentId(equipmentId);
}
}

@ -1,5 +1,7 @@
package com.op.wms.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
@ -56,11 +58,54 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService {
@DS("#header.poolName")
public int insertBaseShiftsT(BaseShiftsT baseShiftsT) {
baseShiftsT.setCreateDate(DateUtils.getNowDate());
baseShiftsT.setUpdateBy(SecurityUtils.getUsername());
baseShiftsT.setCreateBy(SecurityUtils.getUsername());
// Integer result = 1;
// Integer result1 = 1;
// Integer result2 = 1;
// baseShiftsT.setCreateDate(DateUtils.getNowDate());
// baseShiftsT.setCreateBy(SecurityUtils.getUsername());
// //和数据库内所有时间进行比较
// List<Date> startTimeList = new ArrayList<>();
// Integer startTimeNum = startTimeList.size();
// List<Date> endTimeList = new ArrayList<>();
// Integer endTimeNum = endTimeList.size();
// startTimeList = baseShiftsTMapper.queryAllStartTime(baseShiftsT);
// endTimeList = baseShiftsTMapper.queryAllEndTime(baseShiftsT);
// for(Date str : endTimeList) {//其内部实质上还是调用了迭代器遍历方式,这种循环方式还有其他限制,不建议使用。
// Date shiftStartTime = baseShiftsT.getShiftStartTime();
// if(str.after(shiftStartTime)){
// System.out.println("和结束时间比较成功");
// endTimeNum = endTimeNum - 1;
// if(endTimeNum == 0){
// result1 = 1;
// }
// }else{
// result1 = 0;
// }
// }
// for(Date str : startTimeList) {//其内部实质上还是调用了迭代器遍历方式,这种循环方式还有其他限制,不建议使用。
// Date shiftEndTime = baseShiftsT.getShiftEndTime();
// if(str.before(shiftEndTime)){
// System.out.println("和结束时间比较成功");
// startTimeNum = startTimeNum - 1;
// if(startTimeNum == 0){
// result2 = 1;
// }
// }else{
// result2 = 0;
// }
// }
// if(result1 ==1 && result2 ==1){
// baseShiftsTMapper.insertBaseShiftsT(baseShiftsT);
// result = 1;
// }else {
// result = 0;
// }
// return result;
return baseShiftsTMapper.insertBaseShiftsT(baseShiftsT);
}
/**
/*
*
*
* @param baseShiftsT

@ -0,0 +1,166 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.BaseEquipmentMapper">
<resultMap type="BaseEquipment" id="BaseEquipmentResult">
<result property="equipmentId" column="equipment_id" />
<result property="equipmentCode" column="equipment_code" />
<result property="equipmentName" column="equipment_name" />
<result property="equipmentBrand" column="equipment_brand" />
<result property="equipmentSpec" column="equipment_spec" />
<result property="equipmentTypeId" column="equipment_type_id" />
<result property="equipmentTypeCode" column="equipment_type_code" />
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="workshopId" column="workshop_id" />
<result property="workshopCode" column="workshop_code" />
<result property="workshopName" column="workshop_name" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<!-- <result property="unitWorkingHours" column="unit_working_hours" />-->
<result property="workshopSection" column="workshop_section" />
<result property="equipmentLocation" column="equipment_location" />
<result property="hourlyUnitPrice" column="hourly_unit_price" />
</resultMap>
<sql id="selectBaseEquipmentVo">
select equipment_id, equipment_code, equipment_name, equipment_brand, equipment_spec, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, workshop_section, equipment_location, hourly_unit_price from base_equipment
</sql>
<select id="selectBaseEquipmentList" parameterType="BaseEquipment" resultMap="BaseEquipmentResult">
<include refid="selectBaseEquipmentVo"/>
<where>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
<if test="equipmentName != null and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
<if test="equipmentBrand != null and equipmentBrand != ''"> and equipment_brand = #{equipmentBrand}</if>
<if test="equipmentSpec != null and equipmentSpec != ''"> and equipment_spec = #{equipmentSpec}</if>
<if test="equipmentTypeId != null "> and equipment_type_id = #{equipmentTypeId}</if>
<if test="equipmentTypeCode != null and equipmentTypeCode != ''"> and equipment_type_code = #{equipmentTypeCode}</if>
<if test="equipmentTypeName != null and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
<if test="workshopId != null "> and workshop_id = #{workshopId}</if>
<if test="workshopCode != null and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
<if test="workshopName != null and workshopName != ''"> and workshop_name like concat('%', #{workshopName}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if>
<!-- <if test="unitWorkingHours != null and unitWorkingHours != ''"> and unit_working_hours = #{unitWorkingHours}</if>-->
<if test="workshopSection != null and workshopSection != ''"> and workshop_section = #{workshopSection}</if>
<if test="equipmentLocation != null and equipmentLocation != ''"> and equipment_location = #{equipmentLocation}</if>
<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''"> and hourly_unit_price = #{hourlyUnitPrice}</if>
</where>
</select>
<select id="selectBaseEquipmentByEquipmentId" parameterType="Long" resultMap="BaseEquipmentResult">
<include refid="selectBaseEquipmentVo"/>
where equipment_id = #{equipmentId}
</select>
<insert id="insertBaseEquipment" parameterType="BaseEquipment" useGeneratedKeys="true" keyProperty="equipmentId">
insert into base_equipment
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">equipment_code,</if>
<if test="equipmentName != null">equipment_name,</if>
<if test="equipmentBrand != null">equipment_brand,</if>
<if test="equipmentSpec != null">equipment_spec,</if>
<if test="equipmentTypeId != null">equipment_type_id,</if>
<if test="equipmentTypeCode != null">equipment_type_code,</if>
<if test="equipmentTypeName != null">equipment_type_name,</if>
<if test="workshopId != null">workshop_id,</if>
<if test="workshopCode != null">workshop_code,</if>
<if test="workshopName != null">workshop_name,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<!-- <if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours,</if>-->
<if test="workshopSection != null and workshopSection != ''">workshop_section,</if>
<if test="equipmentLocation != null and equipmentLocation != ''">equipment_location,</if>
<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''">hourly_unit_price,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
<if test="equipmentName != null">#{equipmentName},</if>
<if test="equipmentBrand != null">#{equipmentBrand},</if>
<if test="equipmentSpec != null">#{equipmentSpec},</if>
<if test="equipmentTypeId != null">#{equipmentTypeId},</if>
<if test="equipmentTypeCode != null">#{equipmentTypeCode},</if>
<if test="equipmentTypeName != null">#{equipmentTypeName},</if>
<if test="workshopId != null">#{workshopId},</if>
<if test="workshopCode != null">#{workshopCode},</if>
<if test="workshopName != null">#{workshopName},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<!-- <if test="unitWorkingHours != null and unitWorkingHours != ''">#{unitWorkingHours},</if>-->
<if test="workshopSection != null and workshopSection != ''">#{workshopSection},</if>
<if test="equipmentLocation != null and equipmentLocation != ''">#{equipmentLocation},</if>
<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''">#{hourlyUnitPrice},</if>
</trim>
</insert>
<update id="updateBaseEquipment" parameterType="BaseEquipment">
update base_equipment
<trim prefix="SET" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">equipment_code = #{equipmentCode},</if>
<if test="equipmentName != null">equipment_name = #{equipmentName},</if>
<if test="equipmentBrand != null">equipment_brand = #{equipmentBrand},</if>
<if test="equipmentSpec != null">equipment_spec = #{equipmentSpec},</if>
<if test="equipmentTypeId != null">equipment_type_id = #{equipmentTypeId},</if>
<if test="equipmentTypeCode != null">equipment_type_code = #{equipmentTypeCode},</if>
<if test="equipmentTypeName != null">equipment_type_name = #{equipmentTypeName},</if>
<if test="workshopId != null">workshop_id = #{workshopId},</if>
<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
<if test="workshopName != null">workshop_name = #{workshopName},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<!-- <if test="unitWorkingHours != null and unitWorkingHours != ''">unit_working_hours = #{unitWorkingHours},</if>-->
<if test="workshopSection != null and workshopSection != ''">workshop_section = #{workshopSection},</if>
<if test="equipmentLocation != null and equipmentLocation != ''">equipment_location = #{equipmentLocation},</if>
<if test="hourlyUnitPrice != null and hourlyUnitPrice != ''">hourly_unit_price = #{hourlyUnitPrice},</if>
</trim>
where equipment_id = #{equipmentId}
</update>
<delete id="deleteBaseEquipmentByEquipmentId" parameterType="Long">
delete from base_equipment where equipment_id = #{equipmentId}
</delete>
<delete id="deleteBaseEquipmentByEquipmentIds" parameterType="String">
delete from base_equipment where equipment_id in
<foreach item="equipmentId" collection="array" open="(" separator="," close=")">
#{equipmentId}
</foreach>
</delete>
</mapper>

@ -0,0 +1,146 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.BaseEquipmentProductMapper">
<resultMap type="BaseEquipmentProduct" id="BaseEquipmentProductResult">
<result property="equipmentId" column="equipment_id" />
<result property="equipmentCode" column="equipment_code" />
<result property="equipmentName" column="equipment_name" />
<result property="productCode" column="product_code" />
<result property="productDescZh" column="product_desc_zh" />
<result property="equipmentTypeId" column="equipment_type_id" />
<result property="equipmentTypeCode" column="equipment_type_code" />
<result property="equipmentTypeName" column="equipment_type_name" />
<result property="workshopId" column="workshop_id" />
<result property="workshopCode" column="workshop_code" />
<result property="workshopName" column="workshop_name" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="attr1" column="attr1" />
<result property="attr2" column="attr2" />
<result property="attr3" column="attr3" />
<result property="attr4" column="attr4" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectBaseEquipmentProductVo">
select equipment_id, equipment_code, equipment_name, product_code, product_desc_zh, equipment_type_id, equipment_type_code, equipment_type_name, workshop_id, workshop_code, workshop_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from base_equipment_product
</sql>
<select id="selectBaseEquipmentProductList" parameterType="BaseEquipmentProduct" resultMap="BaseEquipmentProductResult">
<include refid="selectBaseEquipmentProductVo"/>
<where>
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
<if test="equipmentName != null and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="productDescZh != null and productDescZh != ''"> and product_desc_zh = #{productDescZh}</if>
<if test="equipmentTypeId != null "> and equipment_type_id = #{equipmentTypeId}</if>
<if test="equipmentTypeCode != null and equipmentTypeCode != ''"> and equipment_type_code = #{equipmentTypeCode}</if>
<if test="equipmentTypeName != null and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
<if test="workshopId != null "> and workshop_id = #{workshopId}</if>
<if test="workshopCode != null and workshopCode != ''"> and workshop_code = #{workshopCode}</if>
<if test="workshopName != null and workshopName != ''"> and workshop_name like concat('%', #{workshopName}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if>
</where>
</select>
<select id="selectBaseEquipmentProductByEquipmentId" parameterType="Long" resultMap="BaseEquipmentProductResult">
<include refid="selectBaseEquipmentProductVo"/>
where equipment_id = #{equipmentId}
</select>
<insert id="insertBaseEquipmentProduct" parameterType="BaseEquipmentProduct" useGeneratedKeys="true" keyProperty="equipmentId">
insert into base_equipment_product
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">equipment_code,</if>
<if test="equipmentName != null">equipment_name,</if>
<if test="productCode != null and productCode != ''">product_code,</if>
<if test="productDescZh != null and productDescZh != ''">product_desc_zh,</if>
<if test="equipmentTypeId != null">equipment_type_id,</if>
<if test="equipmentTypeCode != null">equipment_type_code,</if>
<if test="equipmentTypeName != null">equipment_type_name,</if>
<if test="workshopId != null">workshop_id,</if>
<if test="workshopCode != null">workshop_code,</if>
<if test="workshopName != null">workshop_name,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
<if test="attr2 != null">attr2,</if>
<if test="attr3 != null">attr3,</if>
<if test="attr4 != null">attr4,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
<if test="equipmentName != null">#{equipmentName},</if>
<if test="productCode != null and productCode != ''">#{productCode},</if>
<if test="productDescZh != null and productDescZh != ''">#{productDescZh},</if>
<if test="equipmentTypeId != null">#{equipmentTypeId},</if>
<if test="equipmentTypeCode != null">#{equipmentTypeCode},</if>
<if test="equipmentTypeName != null">#{equipmentTypeName},</if>
<if test="workshopId != null">#{workshopId},</if>
<if test="workshopCode != null">#{workshopCode},</if>
<if test="workshopName != null">#{workshopName},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
<if test="attr2 != null">#{attr2},</if>
<if test="attr3 != null">#{attr3},</if>
<if test="attr4 != null">#{attr4},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateBaseEquipmentProduct" parameterType="BaseEquipmentProduct">
update base_equipment_product
<trim prefix="SET" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">equipment_code = #{equipmentCode},</if>
<if test="equipmentName != null">equipment_name = #{equipmentName},</if>
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
<if test="productDescZh != null and productDescZh != ''">product_desc_zh = #{productDescZh},</if>
<if test="equipmentTypeId != null">equipment_type_id = #{equipmentTypeId},</if>
<if test="equipmentTypeCode != null">equipment_type_code = #{equipmentTypeCode},</if>
<if test="equipmentTypeName != null">equipment_type_name = #{equipmentTypeName},</if>
<if test="workshopId != null">workshop_id = #{workshopId},</if>
<if test="workshopCode != null">workshop_code = #{workshopCode},</if>
<if test="workshopName != null">workshop_name = #{workshopName},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>
<if test="attr3 != null">attr3 = #{attr3},</if>
<if test="attr4 != null">attr4 = #{attr4},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where equipment_id = #{equipmentId}
</update>
<delete id="deleteBaseEquipmentProductByEquipmentId" parameterType="Long">
delete from base_equipment_product where equipment_id = #{equipmentId}
</delete>
<delete id="deleteBaseEquipmentProductByEquipmentIds" parameterType="String">
delete from base_equipment_product where equipment_id in
<foreach item="equipmentId" collection="array" open="(" separator="," close=")">
#{equipmentId}
</foreach>
</delete>
</mapper>

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productId" column="product_id" />
<result property="productCode" column="product_code" />
<result property="productDescZh" column="product_desc_zh" />
<result property="productModel" column="product_model" />
<result property="productDescEn" column="product_desc_en" />
<result property="ruleCode" column="rule_code" />
<result property="oldProductCode" column="old_product_code" />
@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectBaseProductVo">
select product_id, product_code, product_desc_zh, product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent from base_product
select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent from base_product
</sql>
<select id="selectBaseProductList" parameterType="BaseProduct" resultMap="BaseProductResult">
@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="productDescZh != null and productDescZh != ''"> and product_desc_zh = #{productDescZh}</if>
<if test="productModel != null and productModel != ''"> and product_model = #{productModel}</if>
<if test="productDescEn != null and productDescEn != ''"> and product_desc_en = #{productDescEn}</if>
<if test="ruleCode != null and ruleCode != ''"> and rule_code = #{ruleCode}</if>
<if test="oldProductCode != null and oldProductCode != ''"> and old_product_code = #{oldProductCode}</if>
@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productId != null">product_id,</if>
<if test="productCode != null and productCode != ''">product_code,</if>
<if test="productDescZh != null">product_desc_zh,</if>
<if test="productModel != null">product_model,</if>
<if test="productDescEn != null">product_desc_en,</if>
<if test="ruleCode != null">rule_code,</if>
<if test="oldProductCode != null">old_product_code,</if>
@ -147,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productId != null">#{productId},</if>
<if test="productCode != null and productCode != ''">#{productCode},</if>
<if test="productDescZh != null">#{productDescZh},</if>
<if test="productModel != null">#{productModel},</if>
<if test="productDescEn != null">#{productDescEn},</if>
<if test="ruleCode != null">#{ruleCode},</if>
<if test="oldProductCode != null">#{oldProductCode},</if>
@ -193,6 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
<if test="productDescZh != null">product_desc_zh = #{productDescZh},</if>
<if test="productModel != null">product_model = #{productModel},</if>
<if test="productDescEn != null">product_desc_en = #{productDescEn},</if>
<if test="ruleCode != null">rule_code = #{ruleCode},</if>
<if test="oldProductCode != null">old_product_code = #{oldProductCode},</if>

@ -125,4 +125,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{shiftId}
</foreach>
</delete>
<select id="queryAllStartTime" parameterType="String" resultMap="BaseShiftsTResult">
select
</select>
</mapper>
Loading…
Cancel
Save