From c3775846616c3f59f27327a43e8a1c2a95201f1b Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 25 Jul 2023 09:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/ProRouteController.java | 11 + ...er.java => ProRouteProductController.java} | 48 ++-- .../main/java/com/op/mes/domain/ProRoute.java | 10 + ...ProRouteLine.java => ProRouteProduct.java} | 28 +- .../op/mes/mapper/ProRouteProductMapper.java | 68 +++++ ...vice.java => IProRouteProductService.java} | 24 +- .../com/op/mes/service/IProRouteService.java | 2 + .../impl/ProRouteProductServiceImpl.java | 132 +++++++++ .../mes/service/impl/ProRouteServiceImpl.java | 69 +++-- ...neMapper.xml => ProRouteProductMapper.xml} | 75 +++-- .../controller/BaseBomItemsTController.java | 6 +- .../controller/BaseEquipmentController.java | 97 +++++++ .../BaseEquipmentProductController.java | 97 +++++++ .../java/com/op/wms/domain/BaseBomItemsT.java | 4 +- .../java/com/op/wms/domain/BaseEquipment.java | 267 ++++++++++++++++++ .../op/wms/domain/BaseEquipmentProduct.java | 219 ++++++++++++++ .../java/com/op/wms/domain/BaseProduct.java | 33 ++- .../op/wms/mapper/BaseEquipmentMapper.java | 61 ++++ .../mapper/BaseEquipmentProductMapper.java | 61 ++++ .../com/op/wms/mapper/BaseShiftsTMapper.java | 5 + .../service/IBaseEquipmentProductService.java | 60 ++++ .../op/wms/service/IBaseEquipmentService.java | 60 ++++ .../wms/service/impl/BaseAreaServiceImpl.java | 1 + .../impl/BaseEquipmentProductServiceImpl.java | 97 +++++++ .../impl/BaseEquipmentServiceImpl.java | 97 +++++++ .../service/impl/BaseShiftsTServiceImpl.java | 49 +++- .../mapper/wms/BaseEquipmentMapper.xml | 166 +++++++++++ .../mapper/wms/BaseEquipmentProductMapper.xml | 146 ++++++++++ .../mapper/wms/BaseProductMapper.xml | 7 +- .../mapper/wms/BaseShiftsTMapper.xml | 5 + 30 files changed, 1882 insertions(+), 123 deletions(-) rename op-modules/op-mes/src/main/java/com/op/mes/controller/{ProRouteLineController.java => ProRouteProductController.java} (57%) rename op-modules/op-mes/src/main/java/com/op/mes/domain/{ProRouteLine.java => ProRouteProduct.java} (85%) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRouteProductMapper.java rename op-modules/op-mes/src/main/java/com/op/mes/service/{IProRouteLineService.java => IProRouteProductService.java} (50%) create mode 100644 op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteProductServiceImpl.java rename op-modules/op-mes/src/main/resources/mapper/mes/{ProRouteLineMapper.xml => ProRouteProductMapper.xml} (66%) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentProductController.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipmentProduct.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentProductMapper.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentProductService.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentProductServiceImpl.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java create mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml create mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentProductMapper.xml diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteController.java index d886594a..d9e1e2e8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteController.java @@ -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)); + } + /** * 修改工艺路线 */ diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteLineController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteProductController.java similarity index 57% rename from op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteLineController.java rename to op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteProductController.java index 4de67b4f..e5277261 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteLineController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRouteProductController.java @@ -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 list = proRouteLineService.selectProRouteLineList(proRouteLine); + List 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 list = proRouteLineService.selectProRouteLineList(proRouteLine); - ExcelUtil util = new ExcelUtil(ProRouteLine.class); + public void export(HttpServletResponse response, ProRouteProduct proRouteProduct) { + List list = proRouteProductService.selectProRouteProductList(proRouteProduct); + ExcelUtil util = new ExcelUtil(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); } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRoute.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRoute.java index aebfccac..797111e0 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRoute.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRoute.java @@ -56,8 +56,18 @@ public class ProRoute extends BaseEntity private String fileList; private List files; + private List idList; + private String routeVersion; + public List getIdList() { + return idList; + } + + public void setIdList(List idList) { + this.idList = idList; + } + public String getFileList() { return fileList; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteLine.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteProduct.java similarity index 85% rename from op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteLine.java rename to op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteProduct.java index c2a46361..643282df 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteLine.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/ProRouteProduct.java @@ -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 unSelect; - private List selected; + private List unSelect; + private List selected; private List selectedValues; public List getSelectedValues() { @@ -65,19 +65,19 @@ public class ProRouteLine extends BaseEntity { this.selectedValues = selectedValues; } - public List getUnSelect() { + public List getUnSelect() { return unSelect; } - public void setUnSelect(List unSelect) { + public void setUnSelect(List unSelect) { this.unSelect = unSelect; } - public List getSelected() { + public List getSelected() { return selected; } - public void setSelected(List selected) { + public void setSelected(List selected) { this.selected = selected; } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRouteProductMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRouteProductMapper.java new file mode 100644 index 00000000..28f2a8b3 --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRouteProductMapper.java @@ -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 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 getRouteProdProductListUndo(ProRouteProduct proRouteProduct); + List getRouteProdProductListDo(ProRouteProduct proRouteProduct); + + void deleteByRouteId(ProRouteProduct proRouteProduct); +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteLineService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteProductService.java similarity index 50% rename from op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteLineService.java rename to op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteProductService.java index cac81023..4dceb8d0 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteLineService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteProductService.java @@ -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 selectProRouteLineList(ProRouteLine proRouteLine); + public List 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); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteService.java index c8268f5a..779f408c 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRouteService.java @@ -68,4 +68,6 @@ public interface IProRouteService * @return 结果 */ public int deleteProRouteByRouteId(String routeId); + + public int batchInsertProRoute(ProRoute proRoute); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteProductServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteProductServiceImpl.java new file mode 100644 index 00000000..409c337f --- /dev/null +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteProductServiceImpl.java @@ -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 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 unSelected = proRouteProductMapper.getRouteProdProductListUndo(proRouteProduct); + dto.setUnSelect(unSelected); + List selected= proRouteProductMapper.getRouteProdProductListDo(proRouteProduct); + dto.setSelected(selected); + return dto; + } +} diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteServiceImpl.java index cf28fd9c..c8bb6960 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRouteServiceImpl.java @@ -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 files = baseFileMapper.getBaseFileBatch(routeId); - if(!CollectionUtils.isEmpty(files)){ + List 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 selectProRouteList(ProRoute proRoute) - { + public List 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 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 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 ids = proRoute.getIdList(); +// for (int j = ids.size(); j < 1; j--) { + for (String id :ids) { + String[] f = proRoute.getFileList().split(","); + List 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; + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProRouteLineMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProRouteProductMapper.xml similarity index 66% rename from op-modules/op-mes/src/main/resources/mapper/mes/ProRouteLineMapper.xml rename to op-modules/op-mes/src/main/resources/mapper/mes/ProRouteProductMapper.xml index 0f5ee4b9..d2d29a52 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/ProRouteLineMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProRouteProductMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - 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 + + 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 - + and route_id = #{routeId} and item_id = #{itemId} @@ -39,26 +39,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + where record_id = #{recordId} - + 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 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} - - insert into pro_route_line + + insert into pro_route_product record_id, route_id, @@ -93,8 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - update pro_route_line + + update pro_route_product route_id = #{routeId}, item_id = #{itemId}, @@ -113,17 +132,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where record_id = #{recordId} - - delete from pro_route_line where record_id = #{recordId} + + delete from pro_route_product where record_id = #{recordId} - - delete from pro_route_line where record_id in + + delete from pro_route_product where record_id in #{recordId} - delete from pro_route_line where route_id = #{routeId} + delete from pro_route_product where route_id = #{routeId} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java index 7c0deeca..1e629443 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseBomItemsTController.java @@ -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; /** * 物料BOM管理Controller @@ -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 list = baseBomItemsTService.selectBaseBomItemsTList(baseBomItemsT); - return getDataTable(list); + return success(list); } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java new file mode 100644 index 00000000..02d405dc --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -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 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 list = baseEquipmentService.selectBaseEquipmentList(baseEquipment); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentProductController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentProductController.java new file mode 100644 index 00000000..dc3302db --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentProductController.java @@ -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 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 list = baseEquipmentProductService.selectBaseEquipmentProductList(baseEquipmentProduct); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java index bf99ba64..5674ca93 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseBomItemsT.java @@ -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配方组成主键 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java new file mode 100644 index 00000000..df94a4b1 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java @@ -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(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipmentProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipmentProduct.java new file mode 100644 index 00000000..fe0424f0 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipmentProduct.java @@ -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(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index 33251f7b..c203c4c5 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -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; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java new file mode 100644 index 00000000..4a566ad6 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java @@ -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 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); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentProductMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentProductMapper.java new file mode 100644 index 00000000..35bc6ce5 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentProductMapper.java @@ -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 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); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseShiftsTMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseShiftsTMapper.java index a184b224..2ef733e4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseShiftsTMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseShiftsTMapper.java @@ -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 queryAllStartTime(BaseShiftsT baseShiftsT); + + List queryAllEndTime(BaseShiftsT baseShiftsT); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentProductService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentProductService.java new file mode 100644 index 00000000..ecb408d2 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentProductService.java @@ -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 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); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java new file mode 100644 index 00000000..dc07f16d --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java @@ -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 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); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java index 2dea88f1..f571db6d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java @@ -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); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentProductServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentProductServiceImpl.java new file mode 100644 index 00000000..b699d5cd --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentProductServiceImpl.java @@ -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 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); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java new file mode 100644 index 00000000..2a9f4bc5 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java @@ -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 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); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java index 341dc978..a108fe89 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseShiftsTServiceImpl.java @@ -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 startTimeList = new ArrayList<>(); +// Integer startTimeNum = startTimeList.size(); +// List 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 班次管理 diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml new file mode 100644 index 00000000..e06d5d61 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into base_equipment + + 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, + + + #{equipmentCode}, + #{equipmentName}, + #{equipmentBrand}, + #{equipmentSpec}, + #{equipmentTypeId}, + #{equipmentTypeCode}, + #{equipmentTypeName}, + #{workshopId}, + #{workshopCode}, + #{workshopName}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + #{workshopSection}, + #{equipmentLocation}, + #{hourlyUnitPrice}, + + + + + update base_equipment + + equipment_code = #{equipmentCode}, + equipment_name = #{equipmentName}, + equipment_brand = #{equipmentBrand}, + equipment_spec = #{equipmentSpec}, + equipment_type_id = #{equipmentTypeId}, + equipment_type_code = #{equipmentTypeCode}, + equipment_type_name = #{equipmentTypeName}, + workshop_id = #{workshopId}, + workshop_code = #{workshopCode}, + workshop_name = #{workshopName}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + workshop_section = #{workshopSection}, + equipment_location = #{equipmentLocation}, + hourly_unit_price = #{hourlyUnitPrice}, + + where equipment_id = #{equipmentId} + + + + delete from base_equipment where equipment_id = #{equipmentId} + + + + delete from base_equipment where equipment_id in + + #{equipmentId} + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentProductMapper.xml new file mode 100644 index 00000000..20a23c33 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentProductMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into base_equipment_product + + 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, + + + #{equipmentCode}, + #{equipmentName}, + #{productCode}, + #{productDescZh}, + #{equipmentTypeId}, + #{equipmentTypeCode}, + #{equipmentTypeName}, + #{workshopId}, + #{workshopCode}, + #{workshopName}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update base_equipment_product + + equipment_code = #{equipmentCode}, + equipment_name = #{equipmentName}, + product_code = #{productCode}, + product_desc_zh = #{productDescZh}, + equipment_type_id = #{equipmentTypeId}, + equipment_type_code = #{equipmentTypeCode}, + equipment_type_name = #{equipmentTypeName}, + workshop_id = #{workshopId}, + workshop_code = #{workshopCode}, + workshop_name = #{workshopName}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where equipment_id = #{equipmentId} + + + + delete from base_equipment_product where equipment_id = #{equipmentId} + + + + delete from base_equipment_product where equipment_id in + + #{equipmentId} + + + \ No newline at end of file diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index 95ad5849..20337c0c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 + select + + \ No newline at end of file