rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,7 +22,7 @@ // generator.username="sa"; // generator.password="Zoneyung@zy56$"; generator.table = "man_wave_order_rela"; generator.table = "man_wave_sow_item"; generator.tableDesc = "波次策略"; generator.packagePath = "com.vincent.rsf.server.manager";
@@ -14,12 +14,16 @@ import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.TaskItem; import com.vincent.rsf.server.manager.entity.TaskItemLog; import com.vincent.rsf.server.manager.entity.Wave; import com.vincent.rsf.server.manager.entity.WaveItem; import com.vincent.rsf.server.manager.enums.WaveExceStatus; import com.vincent.rsf.server.manager.enums.WaveItemExceStatus; import com.vincent.rsf.server.manager.service.OutStockService; import com.vincent.rsf.server.manager.service.TaskItemLogService; import com.vincent.rsf.server.manager.service.TaskItemService; import com.vincent.rsf.server.manager.service.WaveService; import com.vincent.rsf.server.manager.service.impl.TaskItemLogServiceImpl; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -37,6 +41,10 @@ private WaveService waveService; @Autowired private TaskItemService taskItemService; @Autowired private OutStockService outStockService; @Autowired private TaskItemLogService taskItemLogService; @PreAuthorize("hasAuthority('manager:wave:list')") @PostMapping("/wave/page") @@ -189,6 +197,14 @@ if (Objects.isNull(wave)) { throw new CoolException("波次单不存在！！"); } List<TaskItemLog> taskItems = taskItemLogService.list(new LambdaQueryWrapper<TaskItemLog>().eq(TaskItemLog::getSourceId, wave.getId())); if (taskItems.isEmpty()) { } else { } waveService.update(new LambdaUpdateWrapper<Wave>() .eq(Wave::getId, id) .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)); rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveSowItemController.java
New file @@ -0,0 +1,110 @@ package com.vincent.rsf.server.manager.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.WaveSowItem; import com.vincent.rsf.server.manager.service.WaveSowItemService; import com.vincent.rsf.server.system.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.*; @RestController public class WaveSowItemController extends BaseController { @Autowired private WaveSowItemService waveSowItemService; @PreAuthorize("hasAuthority('manager:waveSowItem:list')") @PostMapping("/waveSowItem/page") public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<WaveSowItem, BaseParam> pageParam = new PageParam<>(baseParam, WaveSowItem.class); return R.ok().add(waveSowItemService.page(pageParam, pageParam.buildWrapper(true))); } @PreAuthorize("hasAuthority('manager:waveSowItem:list')") @PostMapping("/waveSowItem/list") public R list(@RequestBody Map<String, Object> map) { return R.ok().add(waveSowItemService.list()); } @PreAuthorize("hasAuthority('manager:waveSowItem:list')") @PostMapping({"/waveSowItem/many/{ids}", "/waveSowItems/many/{ids}"}) public R many(@PathVariable Long[] ids) { return R.ok().add(waveSowItemService.listByIds(Arrays.asList(ids))); } @PreAuthorize("hasAuthority('manager:waveSowItem:list')") @GetMapping("/waveSowItem/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(waveSowItemService.getById(id)); } @PreAuthorize("hasAuthority('manager:waveSowItem:save')") @OperationLog("Create 波次策略") @PostMapping("/waveSowItem/save") public R save(@RequestBody WaveSowItem waveSowItem) { waveSowItem.setCreateBy(getLoginUserId()); waveSowItem.setCreateTime(new Date()); waveSowItem.setUpdateBy(getLoginUserId()); waveSowItem.setUpdateTime(new Date()); if (!waveSowItemService.save(waveSowItem)) { return R.error("Save Fail"); } return R.ok("Save Success").add(waveSowItem); } @PreAuthorize("hasAuthority('manager:waveSowItem:update')") @OperationLog("Update 波次策略") @PostMapping("/waveSowItem/update") public R update(@RequestBody WaveSowItem waveSowItem) { waveSowItem.setUpdateBy(getLoginUserId()); waveSowItem.setUpdateTime(new Date()); if (!waveSowItemService.updateById(waveSowItem)) { return R.error("Update Fail"); } return R.ok("Update Success").add(waveSowItem); } @PreAuthorize("hasAuthority('manager:waveSowItem:remove')") @OperationLog("Delete 波次策略") @PostMapping("/waveSowItem/remove/{ids}") public R remove(@PathVariable Long[] ids) { if (!waveSowItemService.removeByIds(Arrays.asList(ids))) { return R.error("Delete Fail"); } return R.ok("Delete Success").add(ids); } @PreAuthorize("hasAuthority('manager:waveSowItem:list')") @PostMapping("/waveSowItem/query") public R query(@RequestParam(required = false) String condition) { List<KeyValVo> vos = new ArrayList<>(); LambdaQueryWrapper<WaveSowItem> wrapper = new LambdaQueryWrapper<>(); if (!Cools.isEmpty(condition)) { wrapper.like(WaveSowItem::getId, condition); } waveSowItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach( item -> vos.add(new KeyValVo(item.getId(), item.getId())) ); return R.ok().add(vos); } @PreAuthorize("hasAuthority('manager:waveSowItem:list')") @PostMapping("/waveSowItem/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { ExcelUtil.build(ExcelUtil.create(waveSowItemService.list(), WaveSowItem.class), response); } } rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
@@ -78,6 +78,15 @@ @ApiModelProperty("项目号") private String projectCode; @ApiModelProperty("源编码") private Long source; @ApiModelProperty("源单号") private String sourceCode; @ApiModelProperty("源主单ID") private Long sourceId; /** * 物料编码 */ rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveSowItem.java
New file @@ -0,0 +1,330 @@ package com.vincent.rsf.server.manager.entity; import com.baomidou.mybatisplus.annotation.TableLogic; import java.text.SimpleDateFormat; import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; import java.text.SimpleDateFormat; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.SpringUtils; import com.vincent.rsf.server.system.service.UserService; import com.vincent.rsf.server.system.entity.User; import java.io.Serializable; import java.util.Date; @Data @TableName("man_wave_sow_item") public class WaveSowItem implements Serializable { private static final long serialVersionUID = 1L; /** * ID */ @ApiModelProperty(value= "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 波次ID */ @ApiModelProperty(value= "波次ID") private Long waveId; /** * 波次明细ID */ @ApiModelProperty(value= "波次明细ID") private Long waveItemId; /** * 订单ID */ @ApiModelProperty(value= "订单ID") private Long orderId; /** * 订单明细ID */ @ApiModelProperty(value= "订单明细ID") private Long orderItemId; /** * 任务ID */ @ApiModelProperty(value= "任务ID") private Long taskId; /** * 任务明细ID */ @ApiModelProperty(value= "任务明细ID") private Long taskItemId; /** * 平台ID(行号) */ @ApiModelProperty(value= "平台ID(行号)") private String platItemId; /** * 客户订单号 */ @ApiModelProperty(value= "客户订单号") private String platOrderCode; /** * 工单号 */ @ApiModelProperty(value= "工单号") private String platWorkCode; /** * 项目号 */ @ApiModelProperty(value= "项目号") private String projectCode; /** * 物料ID */ @ApiModelProperty(value= "物料ID") private Long matnrId; /** * 物料名称 */ @ApiModelProperty(value= "物料名称") private String maktx; /** * 物料编码 */ @ApiModelProperty(value= "物料编码") private String matnrCode; /** * 物料跟踪码 */ @ApiModelProperty(value= "物料跟踪码") private String trackCode; /** * 库存单位 */ @ApiModelProperty(value= "库存单位") private String unit; /** * 数量 */ @ApiModelProperty(value= "数量") private Double anfme; /** * 库存批次 */ @ApiModelProperty(value= "库存批次") private String batch; /** * 规格 */ @ApiModelProperty(value= "规格") private String spec; /** * 型号 */ @ApiModelProperty(value= "型号") private String model; /** * 字段索引 */ @ApiModelProperty(value= "字段索引") private String fieldsIndex; /** * 状态 1: 正常 0: 冻结 */ @ApiModelProperty(value= "状态 1: 正常 0: 冻结 ") private Integer status; /** * 是否删除 1: 是 0: 否 */ @ApiModelProperty(value= "是否删除 1: 是 0: 否 ") @TableLogic private Integer deleted; /** * 租户 */ @ApiModelProperty(value= "租户") private Integer tenantId; /** * 添加人员 */ @ApiModelProperty(value= "添加人员") private Long createBy; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") private Long updateBy; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; /** * 备注 */ @ApiModelProperty(value= "备注") private String memo; public WaveSowItem() {} public WaveSowItem(Long waveId,Long waveItemId,Long orderId,Long orderItemId,Long taskId,Long taskItemId,String platItemId,String platOrderCode,String platWorkCode,String projectCode,Long matnrId,String maktx,String matnrCode,String trackCode,String unit,Double anfme,String batch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { this.waveId = waveId; this.waveItemId = waveItemId; this.orderId = orderId; this.orderItemId = orderItemId; this.taskId = taskId; this.taskItemId = taskItemId; this.platItemId = platItemId; this.platOrderCode = platOrderCode; this.platWorkCode = platWorkCode; this.projectCode = projectCode; this.matnrId = matnrId; this.maktx = maktx; this.matnrCode = matnrCode; this.trackCode = trackCode; this.unit = unit; this.anfme = anfme; this.batch = batch; this.spec = spec; this.model = model; this.fieldsIndex = fieldsIndex; this.status = status; this.deleted = deleted; this.tenantId = tenantId; this.createBy = createBy; this.createTime = createTime; this.updateBy = updateBy; this.updateTime = updateTime; this.memo = memo; } // WaveSowItem waveSowItem = new WaveSowItem( // null, // 波次ID // null, // 波次明细ID // null, // 订单ID // null, // 订单明细ID // null, // 任务ID // null, // 任务明细ID // null, // 平台ID(行号) // null, // 客户订单号 // null, // 工单号 // null, // 项目号 // null, // 物料ID // null, // 物料名称 // null, // 物料编码 // null, // 物料跟踪码 // null, // 库存单位 // null, // 数量 // null, // 库存批次 // null, // 规格 // null, // 型号 // null, // 字段索引 // null, // 状态[非空] // null, // 是否删除[非空] // null, // 租户 // null, // 添加人员 // null, // 添加时间[非空] // null, // 修改人员 // null, // 修改时间[非空] // null // 备注 // ); public String getStatus$(){ if (null == this.status){ return null; } switch (this.status){ case 1: return "正常"; case 0: return "冻结"; default: return String.valueOf(this.status); } } public String getCreateBy$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.getById(this.createBy); if (!Cools.isEmpty(user)){ return String.valueOf(user.getNickname()); } return null; } public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); } public String getUpdateBy$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.getById(this.updateBy); if (!Cools.isEmpty(user)){ return String.valueOf(user.getNickname()); } return null; } public String getUpdateTime$(){ if (Cools.isEmpty(this.updateTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); } public Boolean getStatusBool(){ if (null == this.status){ return null; } switch (this.status){ case 1: return true; case 0: return false; default: return null; } } } rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaveSowItemMapper.java
New file @@ -0,0 +1,12 @@ package com.vincent.rsf.server.manager.mapper; import com.vincent.rsf.server.manager.entity.WaveSowItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository public interface WaveSowItemMapper extends BaseMapper<WaveSowItem> { } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveSowItemService.java
New file @@ -0,0 +1,8 @@ package com.vincent.rsf.server.manager.service; import com.baomidou.mybatisplus.extension.service.IService; import com.vincent.rsf.server.manager.entity.WaveSowItem; public interface WaveSowItemService extends IService<WaveSowItem> { } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveSowItemServiceImpl.java
New file @@ -0,0 +1,12 @@ package com.vincent.rsf.server.manager.service.impl; import com.vincent.rsf.server.manager.mapper.WaveSowItemMapper; import com.vincent.rsf.server.manager.entity.WaveSowItem; import com.vincent.rsf.server.manager.service.WaveSowItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service("waveSowItemService") public class WaveSowItemServiceImpl extends ServiceImpl<WaveSowItemMapper, WaveSowItem> implements WaveSowItemService { } rsf-server/src/main/resources/mapper/manager/WaveSowItemMapper.xml
New file @@ -0,0 +1,5 @@ <?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.vincent.rsf.server.manager.mapper.WaveSowItemMapper"> </mapper>
