bonus
/
Material_Station_System
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并领料代码

This commit is contained in:
sxu 2024-11-13 18:26:33 +08:00
parent be2c9ff8a3
commit 3806ae330a
15 changed files with 507 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyDetailsController.java
View File

@ -1,119 +1,119 @@
package com.bonus.material.lease.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.bonus.common.log.annotation.SysLog;
import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.service.ILeaseApplyDetailsService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.page.TableDataInfo;
/**
* 领料任务详细Controller
*
* @author xsheng
* @date 2024-10-16
*/
@Api(tags = "领料任务详细接口")
@RestController
@RequestMapping("/lease_apply_details")
public class LeaseApplyDetailsController extends BaseController {
@Autowired
private ILeaseApplyDetailsService leaseApplyDetailsService;
/**
* 查询领料任务详细列表
*/
@ApiOperation(value = "查询领料任务详细列表")
@RequiresPermissions("lease:details:list")
@GetMapping("/list")
public TableDataInfo list(LeaseApplyDetails leaseApplyDetails) {
startPage();
List<LeaseApplyDetails> list = leaseApplyDetailsService.selectLeaseApplyDetailsList(leaseApplyDetails);
return getDataTable(list);
}
/**
* 导出领料任务详细列表
*/
@ApiOperation(value = "导出领料任务详细列表")
@PreventRepeatSubmit
@RequiresPermissions("lease:details:export")
@SysLog(title = "领料任务详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料任务详细")
@PostMapping("/export")
public void export(HttpServletResponse response, LeaseApplyDetails leaseApplyDetails) {
List<LeaseApplyDetails> list = leaseApplyDetailsService.selectLeaseApplyDetailsList(leaseApplyDetails);
ExcelUtil<LeaseApplyDetails> util = new ExcelUtil<LeaseApplyDetails>(LeaseApplyDetails.class);
util.exportExcel(response, list, "领料任务详细数据");
}
/**
* 获取领料任务详细详细信息
*/
@ApiOperation(value = "获取领料任务详细详细信息")
@RequiresPermissions("lease:details:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(leaseApplyDetailsService.selectLeaseApplyDetailsById(id));
}
/**
* 新增领料任务详细
*/
@ApiOperation(value = "新增领料任务详细")
@PreventRepeatSubmit
@RequiresPermissions("lease:details:add")
@SysLog(title = "领料任务详细", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料任务详细")
@PostMapping
public AjaxResult add(@RequestBody LeaseApplyDetails leaseApplyDetails) {
try {
return toAjax(leaseApplyDetailsService.insertLeaseApplyDetails(leaseApplyDetails));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* 修改领料任务详细
*/
@ApiOperation(value = "修改领料任务详细")
@PreventRepeatSubmit
@RequiresPermissions("lease:details:edit")
@SysLog(title = "领料任务详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料任务详细")
@PutMapping
public AjaxResult edit(@RequestBody LeaseApplyDetails leaseApplyDetails) {
try {
return toAjax(leaseApplyDetailsService.updateLeaseApplyDetails(leaseApplyDetails));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* 删除领料任务详细
*/
@ApiOperation(value = "删除领料任务详细")
@PreventRepeatSubmit
@RequiresPermissions("lease:details:remove")
@SysLog(title = "领料任务详细", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除领料任务详细")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(leaseApplyDetailsService.deleteLeaseApplyDetailsByIds(ids));
}
}
//package com.bonus.material.lease.controller;
//
//import java.util.List;
//import javax.servlet.http.HttpServletResponse;
//import com.bonus.common.log.enums.OperaType;
//import com.bonus.material.common.annotation.PreventRepeatSubmit;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//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.bonus.common.log.annotation.SysLog;
//import com.bonus.common.security.annotation.RequiresPermissions;
//import com.bonus.material.lease.domain.LeaseApplyDetails;
//import com.bonus.material.lease.service.ILeaseApplyDetailsService;
//import com.bonus.common.core.web.controller.BaseController;
//import com.bonus.common.core.web.domain.AjaxResult;
//import com.bonus.common.core.utils.poi.ExcelUtil;
//import com.bonus.common.core.web.page.TableDataInfo;
//
///**
// * 领料任务详细Controller
// *
// * @author xsheng
// * @date 2024-10-16
// */
//@Api(tags = "领料任务详细接口")
//@RestController
//@RequestMapping("/lease_apply_details")
//public class LeaseApplyDetailsController extends BaseController {
// @Autowired
// private ILeaseApplyDetailsService leaseApplyDetailsService;
//
// /**
// * 查询领料任务详细列表
// */
// @ApiOperation(value = "查询领料任务详细列表")
// @RequiresPermissions("lease:details:list")
// @GetMapping("/list")
// public TableDataInfo list(LeaseApplyDetails leaseApplyDetails) {
// startPage();
// List<LeaseApplyDetails> list = leaseApplyDetailsService.selectLeaseApplyDetailsList(leaseApplyDetails);
// return getDataTable(list);
// }
//
// /**
// * 导出领料任务详细列表
// */
// @ApiOperation(value = "导出领料任务详细列表")
// @PreventRepeatSubmit
// @RequiresPermissions("lease:details:export")
// @SysLog(title = "领料任务详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料任务详细")
// @PostMapping("/export")
// public void export(HttpServletResponse response, LeaseApplyDetails leaseApplyDetails) {
// List<LeaseApplyDetails> list = leaseApplyDetailsService.selectLeaseApplyDetailsList(leaseApplyDetails);
// ExcelUtil<LeaseApplyDetails> util = new ExcelUtil<LeaseApplyDetails>(LeaseApplyDetails.class);
// util.exportExcel(response, list, "领料任务详细数据");
// }
//
// /**
// * 获取领料任务详细详细信息
// */
// @ApiOperation(value = "获取领料任务详细详细信息")
// @RequiresPermissions("lease:details:query")
// @GetMapping(value = "/{id}")
// public AjaxResult getInfo(@PathVariable("id") Long id) {
// return success(leaseApplyDetailsService.selectLeaseApplyDetailsById(id));
// }
//
// /**
// * 新增领料任务详细
// */
// @ApiOperation(value = "新增领料任务详细")
// @PreventRepeatSubmit
// @RequiresPermissions("lease:details:add")
// @SysLog(title = "领料任务详细", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料任务详细")
// @PostMapping
// public AjaxResult add(@RequestBody LeaseApplyDetails leaseApplyDetails) {
// try {
// return toAjax(leaseApplyDetailsService.insertLeaseApplyDetails(leaseApplyDetails));
// } catch (Exception e) {
// return error("系统错误, " + e.getMessage());
// }
// }
//
// /**
// * 修改领料任务详细
// */
// @ApiOperation(value = "修改领料任务详细")
// @PreventRepeatSubmit
// @RequiresPermissions("lease:details:edit")
// @SysLog(title = "领料任务详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料任务详细")
// @PutMapping
// public AjaxResult edit(@RequestBody LeaseApplyDetails leaseApplyDetails) {
// try {
// return toAjax(leaseApplyDetailsService.updateLeaseApplyDetails(leaseApplyDetails));
// } catch (Exception e) {
// return error("系统错误, " + e.getMessage());
// }
// }
//
// /**
// * 删除领料任务详细
// */
// @ApiOperation(value = "删除领料任务详细")
// @PreventRepeatSubmit
// @RequiresPermissions("lease:details:remove")
// @SysLog(title = "领料任务详细", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除领料任务详细")
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable Long[] ids) {
// return toAjax(leaseApplyDetailsService.deleteLeaseApplyDetailsByIds(ids));
// }
//}

27
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseApplyInfoController.java
View File

@ -8,12 +8,12 @@ import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo;
import com.bonus.material.lease.domain.vo.LeaseOutRequestVo;
import com.bonus.material.lease.service.ILeaseApplyInfoService;
import com.bonus.material.task.domain.vo.TmTaskRequestVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
@ -77,7 +77,7 @@ public class LeaseApplyInfoController extends BaseController {
//@RequiresPermissions("lease:info:add")
@SysLog(title = "领料任务", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料任务")
@PostMapping
public AjaxResult add(@NotNull(message = "领料任务不能为空") @RequestBody TmTaskRequestVo tmTaskRequestVo) {
public AjaxResult add(@NotNull(message = "领料任务不能为空") @RequestBody LeaseApplyRequestVo tmTaskRequestVo) {
try {
return leaseApplyInfoService.insertLeaseApplyInfo(tmTaskRequestVo);
} catch (Exception e) {
@ -93,9 +93,9 @@ public class LeaseApplyInfoController extends BaseController {
//@RequiresPermissions("lease:info:edit")
@SysLog(title = "领料任务", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料任务")
@PutMapping
public AjaxResult edit(@RequestBody @NotNull TmTaskRequestVo tmTaskRequestVo) {
public AjaxResult edit(@RequestBody @NotNull LeaseApplyRequestVo leaseApplyRequestVo) {
try {
return toAjax(leaseApplyInfoService.updateLeaseApplyInfo(tmTaskRequestVo));
return toAjax(leaseApplyInfoService.updateLeaseApplyInfo(leaseApplyRequestVo));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
@ -127,6 +127,23 @@ public class LeaseApplyInfoController extends BaseController {
return success("批量发布完成");
}
/**
* 领料：出库
*/
@ApiOperation(value = "领料出库")
@PreventRepeatSubmit
//@RequiresPermissions("lease:info:add")
@SysLog(title = "领料出库", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->领料出库")
@PostMapping("/submitOut")
public AjaxResult submitOut(@NotNull(message = "领料出库信息不能为空") @RequestBody LeaseOutRequestVo leaseOutRequestVo) {
try {
return leaseApplyInfoService.submitOut(leaseOutRequestVo);
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* 删除领料任务
*/

226
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseOutDetailsController.java
View File

@ -1,113 +1,113 @@
package com.bonus.material.lease.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.bonus.common.log.annotation.SysLog;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.material.lease.service.ILeaseOutDetailsService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.page.TableDataInfo;
/**
* 领料出库详细Controller
*
* @author xsheng
* @date 2024-10-16
*/
@Api(tags = "领料出库详细接口")
@RestController
@RequestMapping("/lease_out_details")
public class LeaseOutDetailsController extends BaseController {
@Autowired
private ILeaseOutDetailsService leaseOutDetailsService;
/**
* 查询领料出库详细列表
*/
@ApiOperation(value = "查询领料出库详细列表")
@GetMapping("/list")
public TableDataInfo list(LeaseOutDetails leaseOutDetails) {
startPage();
List<LeaseOutDetails> list = leaseOutDetailsService.selectLeaseOutDetailsList(leaseOutDetails);
return getDataTable(list);
}
/**
* 导出领料出库详细列表
*/
@ApiOperation(value = "导出领料出库详细列表")
@PreventRepeatSubmit
@SysLog(title = "领料出库详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料出库详细")
@PostMapping("/export")
public void export(HttpServletResponse response, LeaseOutDetails leaseOutDetails) {
List<LeaseOutDetails> list = leaseOutDetailsService.selectLeaseOutDetailsList(leaseOutDetails);
ExcelUtil<LeaseOutDetails> util = new ExcelUtil<>(LeaseOutDetails.class);
util.exportExcel(response, list, "领料出库详细数据");
}
/**
* 获取领料出库详细详细信息
*/
@ApiOperation(value = "获取领料出库详细详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(leaseOutDetailsService.selectLeaseOutDetailsById(id));
}
/**
* 新增领料出库详细
*/
@ApiOperation(value = "新增领料出库详细")
@PreventRepeatSubmit
@SysLog(title = "领料出库详细", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料出库详细")
@PostMapping
public AjaxResult add(@RequestBody List<LeaseOutDetails> leaseOutDetailsList) {
try {
return leaseOutDetailsService.insertLeaseOutDetails(leaseOutDetailsList);
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* 修改领料出库详细
*/
@ApiOperation(value = "修改领料出库详细")
@PreventRepeatSubmit
@SysLog(title = "领料出库详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料出库详细")
@PutMapping
public AjaxResult edit(@RequestBody LeaseOutDetails leaseOutDetails) {
try {
return toAjax(leaseOutDetailsService.updateLeaseOutDetails(leaseOutDetails));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
}
/**
* 删除领料出库详细
*/
@ApiOperation(value = "删除领料出库详细")
@PreventRepeatSubmit
@SysLog(title = "领料出库详细", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除领料出库详细")
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(leaseOutDetailsService.deleteLeaseOutDetailsByIds(ids));
}
}
//package com.bonus.material.lease.controller;
//
//import java.util.List;
//import javax.servlet.http.HttpServletResponse;
//import com.bonus.common.log.enums.OperaType;
//import com.bonus.material.common.annotation.PreventRepeatSubmit;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//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.bonus.common.log.annotation.SysLog;
//import com.bonus.material.lease.domain.LeaseOutDetails;
//import com.bonus.material.lease.service.ILeaseOutDetailsService;
//import com.bonus.common.core.web.controller.BaseController;
//import com.bonus.common.core.web.domain.AjaxResult;
//import com.bonus.common.core.utils.poi.ExcelUtil;
//import com.bonus.common.core.web.page.TableDataInfo;
//
///**
// * 领料出库详细Controller
// *
// * @author xsheng
// * @date 2024-10-16
// */
//@Api(tags = "领料出库详细接口")
//@RestController
//@RequestMapping("/lease_out_details")
//public class LeaseOutDetailsController extends BaseController {
//
// @Autowired
// private ILeaseOutDetailsService leaseOutDetailsService;
//
// /**
// * 查询领料出库详细列表
// */
// @ApiOperation(value = "查询领料出库详细列表")
// @GetMapping("/list")
// public TableDataInfo list(LeaseOutDetails leaseOutDetails) {
// startPage();
// List<LeaseOutDetails> list = leaseOutDetailsService.selectLeaseOutDetailsList(leaseOutDetails);
// return getDataTable(list);
// }
//
// /**
// * 导出领料出库详细列表
// */
// @ApiOperation(value = "导出领料出库详细列表")
// @PreventRepeatSubmit
// @SysLog(title = "领料出库详细", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出领料出库详细")
// @PostMapping("/export")
// public void export(HttpServletResponse response, LeaseOutDetails leaseOutDetails) {
// List<LeaseOutDetails> list = leaseOutDetailsService.selectLeaseOutDetailsList(leaseOutDetails);
// ExcelUtil<LeaseOutDetails> util = new ExcelUtil<>(LeaseOutDetails.class);
// util.exportExcel(response, list, "领料出库详细数据");
// }
//
// /**
// * 获取领料出库详细详细信息
// */
// @ApiOperation(value = "获取领料出库详细详细信息")
// @GetMapping(value = "/{id}")
// public AjaxResult getInfo(@PathVariable("id") Long id) {
// return success(leaseOutDetailsService.selectLeaseOutDetailsById(id));
// }
//
// /**
// * 新增领料出库详细
// */
// @ApiOperation(value = "新增领料出库详细")
// @PreventRepeatSubmit
// @SysLog(title = "领料出库详细", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增领料出库详细")
// @PostMapping
// public AjaxResult add(@RequestBody List<LeaseOutDetails> leaseOutDetailsList) {
// try {
// return leaseOutDetailsService.insertLeaseOutDetails(leaseOutDetailsList);
// } catch (Exception e) {
// return error("系统错误, " + e.getMessage());
// }
// }
//
// /**
// * 修改领料出库详细
// */
// @ApiOperation(value = "修改领料出库详细")
// @PreventRepeatSubmit
// @SysLog(title = "领料出库详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改领料出库详细")
// @PutMapping
// public AjaxResult edit(@RequestBody LeaseOutDetails leaseOutDetails) {
// try {
// return toAjax(leaseOutDetailsService.updateLeaseOutDetails(leaseOutDetails));
// } catch (Exception e) {
// return error("系统错误, " + e.getMessage());
// }
// }
//
// /**
// * 删除领料出库详细
// */
// @ApiOperation(value = "删除领料出库详细")
// @PreventRepeatSubmit
// @SysLog(title = "领料出库详细", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除领料出库详细")
// @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable Long[] ids) {
// return toAjax(leaseOutDetailsService.deleteLeaseOutDetailsByIds(ids));
// }
//}

56
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java
View File

@ -18,7 +18,6 @@ import com.bonus.common.core.web.domain.BaseEntity;
* @date 2024-10-16
*/
@EqualsAndHashCode(callSuper = false)
@Data
@ToString
@ -29,7 +28,7 @@ public class LeaseApplyInfo extends BaseEntity {
/** ID */
private Long id;
/** 领料单号 */
/** 任务编号: 领料单号 */
@Excel(name = "领料单号")
@ApiModelProperty(value = "领料单号")
private String code;
@ -132,10 +131,6 @@ public class LeaseApplyInfo extends BaseEntity {
@ApiModelProperty(value = "费用承担方(01项目03分包)")
private String costBearingParty;
/** 机具规格详情列表 */
@ApiModelProperty(value = "机具规格详情列表")
List<LeaseApplyDetails> leaseApplyDetails;
@ApiModelProperty(value = "租赁工程")
@Excel(name = "领料工程")
private String leaseProject;
@ -157,4 +152,53 @@ public class LeaseApplyInfo extends BaseEntity {
@Excel(name = "协议号")
private String agreementCode;
/** 任务类型(定义数据字典) */
@Excel(name = "任务类型(定义数据字典)")
@ApiModelProperty(value = "任务类型(定义数据字典)")
private Integer taskType;
/** 任务状态(定义数据字典) */
@Excel(name = "任务状态(定义数据字典)")
@ApiModelProperty(value = "任务状态(定义数据字典)")
private Integer taskStatus;
@ApiModelProperty(value = "任务当月序号 例如:1 插入及查询时请携带任务类型")
private Integer monthOrder;
@ApiModelProperty(value = "领料人手机号")
//@Excel(name = "联系电话", sort = 6)
private String leasePhone;
@ApiModelProperty(value = "往来单位id")
private Long unitId;
@ApiModelProperty(value = "往来单位")
//@Excel(name = "领料单位", sort = 2)
private String unitName;
@ApiModelProperty(value = "工程id")
private Long projectId;
/**
* 工程名称
*/
@ApiModelProperty(value = "工程名称")
@Excel(name = "领料工程", sort = 3)
private String projectName;
/**
* 预领料合计数
*/
@ApiModelProperty(value = "预领料合计数")
private Integer preCountNum;
@ApiModelProperty(value = "开始时间")
private String startTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
@ApiModelProperty(value = "关键字")
private String keyWord;
}

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseApplyRequestVo.java
View File

@ -3,6 +3,7 @@ package com.bonus.material.lease.domain.vo;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -11,19 +12,23 @@ import java.util.List;
/**
* 领料任务对象 lease_apply_info
*
* 领料申请物资列表 leaseApplyDetailsList
*
* @author xsheng
* @date 2024-10-16
*/
@EqualsAndHashCode(callSuper = false)
@Data
@ToString
public class LeaseApplyRequestVo extends BaseEntity {
/** 领料-任务对象 */
@ApiModelProperty(value = "领料-任务对象")
private LeaseApplyInfo leaseApplyInfo;
/** 领料-机具规格详情列表 */
@ApiModelProperty(value = "领料-机具规格详情列表")
private List<LeaseApplyDetails> leaseApplyDetailsList;
}

35
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/vo/LeaseOutRequestVo.java Normal file
View File

@ -0,0 +1,35 @@
package com.bonus.material.lease.domain.vo;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.lease.domain.LeaseOutDetails;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List;
/**
* 领料出库任务对象 lease_apply_info
* 领料出库物资列表 leaseOutDetailsList
*
* @author xsheng
* @date 2024-10-16
*/
@EqualsAndHashCode(callSuper = false)
@Data
@ToString
public class LeaseOutRequestVo extends BaseEntity {
/** 领料-任务对象 */
@ApiModelProperty(value = "领料-任务对象")
private LeaseApplyInfo leaseApplyInfo;
/** 领料-机具规格详情列表 */
@ApiModelProperty(value = "领料-机具规格详情列表")
private List<LeaseOutDetails> leaseOutDetailsList;
}

22
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseApplyInfoService.java
View File

@ -1,11 +1,11 @@
package com.bonus.material.lease.service;
import java.util.List;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo;
import com.bonus.material.task.domain.vo.TmTaskRequestVo;
import com.bonus.material.lease.domain.vo.LeaseOutRequestVo;
/**
* 领料任务Service接口
@ -36,7 +36,7 @@ public interface ILeaseApplyInfoService {
* @param leaseApplyRequestVo 领料任务
* @return 结果
*/
AjaxResult insertLeaseApplyInfo(TmTaskRequestVo leaseApplyRequestVo);
AjaxResult insertLeaseApplyInfo(LeaseApplyRequestVo leaseApplyRequestVo);
/**
* 发布任务
@ -46,10 +46,22 @@ public interface ILeaseApplyInfoService {
/**
* 修改领料任务
*
* @param tmTaskRequestVo 领料任务
* @param leaseApplyRequestVo 领料任务
* @return 结果
*/
boolean updateLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo);
boolean updateLeaseApplyInfo(LeaseApplyRequestVo leaseApplyRequestVo);
/**
* 领料：出库
*
* @param leaseOutRequestVo 领料：出库
* @return 结果
*/
AjaxResult submitOut(LeaseOutRequestVo leaseOutRequestVo);
/**
* 批量删除领料任务

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/ILeaseOutDetailsService.java
View File

@ -59,4 +59,6 @@ public interface ILeaseOutDetailsService {
* @return 结果
*/
int deleteLeaseOutDetailsById(Long id);
public AjaxResult submitOut(LeaseOutDetails record);
}

64
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.bonus.material.lease.service.impl;
import java.util.List;
import java.util.Optional;
import cn.hutool.core.collection.CollectionUtil;
import com.bonus.common.biz.constant.MaterialConstants;
import com.bonus.common.biz.enums.LeaseTaskStatusEnum;
@ -13,13 +12,16 @@ import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseOutDetails;
import com.bonus.material.lease.domain.vo.LeaseApplyRequestVo;
import com.bonus.material.lease.domain.vo.LeaseOutRequestVo;
import com.bonus.material.lease.mapper.LeaseApplyDetailsMapper;
import com.bonus.material.lease.service.ILeaseOutDetailsService;
import com.bonus.material.task.domain.TmTask;
import com.bonus.material.task.domain.TmTaskAgreement;
import com.bonus.material.task.domain.vo.TmTaskRequestVo;
import com.bonus.material.task.mapper.TmTaskAgreementMapper;
import com.bonus.material.task.mapper.TmTaskMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.stereotype.Service;
import com.bonus.material.lease.mapper.LeaseApplyInfoMapper;
@ -27,7 +29,6 @@ import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.lease.service.ILeaseApplyInfoService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
/**
@ -39,6 +40,9 @@ import javax.annotation.Resource;
@Service
public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
@Autowired
private ILeaseOutDetailsService leaseOutDetailsService;
@Resource
private LeaseApplyInfoMapper leaseApplyInfoMapper;
@ -95,37 +99,37 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
/**
* 新增领料任务
*
* @param tmTaskRequestVo 领料任务
* @param leaseApplyRequestVo 领料任务
* @return 结果
*/
@Override
public AjaxResult insertLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo) {
if (tmTaskRequestVo.getLeaseApplyInfo() == null) {
public AjaxResult insertLeaseApplyInfo(LeaseApplyRequestVo leaseApplyRequestVo) {
if (leaseApplyRequestVo.getLeaseApplyInfo() == null) {
return AjaxResult.error("请先填写领料任务信息");
}
if (CollectionUtil.isEmpty(tmTaskRequestVo.getLeaseApplyDetailsList())) {
if (CollectionUtil.isEmpty(leaseApplyRequestVo.getLeaseApplyDetailsList())) {
return AjaxResult.error("请先添加领料任务物资明细");
}
tmTaskRequestVo.getLeaseApplyInfo().setCreateTime(DateUtils.getNowDate());
tmTaskRequestVo.getLeaseApplyInfo().setCreateBy(SecurityUtils.getUsername());
leaseApplyRequestVo.getLeaseApplyInfo().setCreateTime(DateUtils.getNowDate());
leaseApplyRequestVo.getLeaseApplyInfo().setCreateBy(SecurityUtils.getUsername());
try {
int thisMonthMaxOrder = tmTaskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId());
String taskCode = genderTaskCode(thisMonthMaxOrder);
TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId(),
PurchaseTaskStatusEnum.TO_NOTICE.getStatus(),
tmTaskRequestVo.getLeaseApplyInfo().getCompanyId(), "1", thisMonthMaxOrder + 1, taskCode);
leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId(), "1", thisMonthMaxOrder + 1, taskCode);
tmTask.setCreateTime(DateUtils.getNowDate());
tmTask.setCreateBy(SecurityUtils.getUsername());
tmTaskMapper.insertTmTask(tmTask);
TmTaskAgreement tmTaskAgreement = new TmTaskAgreement(tmTask.getTaskId(), tmTaskRequestVo.getLeaseApplyInfo().getAgreementId());
TmTaskAgreement tmTaskAgreement = new TmTaskAgreement(tmTask.getTaskId(), leaseApplyRequestVo.getLeaseApplyInfo().getAgreementId());
tmTaskAgreement.setCreateTime(DateUtils.getNowDate());
tmTaskAgreement.setCreateBy(SecurityUtils.getUsername());
tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement);
tmTaskRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId());
tmTaskRequestVo.getLeaseApplyInfo().setCode(taskCode);
int count = leaseApplyInfoMapper.insertLeaseApplyInfo(tmTaskRequestVo.getLeaseApplyInfo());
leaseApplyRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId());
leaseApplyRequestVo.getLeaseApplyInfo().setCode(taskCode);
int count = leaseApplyInfoMapper.insertLeaseApplyInfo(leaseApplyRequestVo.getLeaseApplyInfo());
if (count > 0) {
return insertPurchaseCheckDetails(tmTaskRequestVo.getLeaseApplyDetailsList(), tmTask.getTaskId());
return insertPurchaseCheckDetails(leaseApplyRequestVo.getLeaseApplyDetailsList(), tmTask.getTaskId());
} else {
return AjaxResult.error("新增任务失败,lease_apply_info表插入0条");
}
@ -204,14 +208,14 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
/**
* 修改领料任务
*
* @param tmTaskRequestVo 领料任务
* @param leaseApplyRequestVo 领料任务
* @return 结果
*/
@Override
public boolean updateLeaseApplyInfo(TmTaskRequestVo tmTaskRequestVo) {
public boolean updateLeaseApplyInfo(LeaseApplyRequestVo leaseApplyRequestVo) {
try {
// 提取到局部变量中，减少重复代码
LeaseApplyInfo leaseApplyInfo = tmTaskRequestVo.getLeaseApplyInfo();
LeaseApplyInfo leaseApplyInfo = leaseApplyRequestVo.getLeaseApplyInfo();
if (leaseApplyInfo != null && leaseApplyInfo.getId() != null) {
leaseApplyInfo.setUpdateTime(DateUtils.getNowDate());
leaseApplyInfo.setUpdateBy(SecurityUtils.getUsername());
@ -219,10 +223,10 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
// 去除创建一个新的数组对象，直接复用
Long[] ids = {leaseApplyInfo.getId()};
if (CollectionUtil.isNotEmpty(tmTaskRequestVo.getLeaseApplyDetailsList())) {
if (CollectionUtil.isNotEmpty(leaseApplyRequestVo.getLeaseApplyDetailsList())) {
// 业务逻辑代码
leaseApplyDetailsMapper.deleteLeaseApplyDetailsByParentIds(ids);
insertPurchaseCheckDetails(tmTaskRequestVo.getLeaseApplyDetailsList(), leaseApplyInfo.getTaskId());
insertPurchaseCheckDetails(leaseApplyRequestVo.getLeaseApplyDetailsList(), leaseApplyInfo.getTaskId());
}
// 修改外层info
leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo);
@ -238,6 +242,26 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
}
}
/**
* 领料：出库
*
* @param leaseOutRequestVo 领料：出库
* @return 结果
*/
@Override
public AjaxResult submitOut(LeaseOutRequestVo leaseOutRequestVo) {
for (LeaseOutDetails bean : leaseOutRequestVo.getLeaseOutDetailsList()) {
AjaxResult ajaxResult = leaseOutDetailsService.submitOut(bean);
if (ajaxResult.isError()) {
return ajaxResult;
}
}
return AjaxResult.success();
}
/**
* 批量删除领料任务
*

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -125,7 +125,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
* @param record 出库对象
* @return 结果
*/
//@Override
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult submitOut(LeaseOutDetails record) {
int res = 0;

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/task/controller/TmTaskController.java
View File

@ -2,11 +2,8 @@ package com.bonus.material.task.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.task.domain.vo.TmTaskRequestVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;

194
bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java
View File

@ -1,97 +1,97 @@
package com.bonus.material.task.domain.vo;
import com.bonus.common.core.annotation.Excel;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class TmTaskRequestVo extends BaseEntity {
/** 任务ID */
private Long taskId;
/** 任务类型(定义数据字典) */
@Excel(name = "任务类型(定义数据字典)")
@ApiModelProperty(value = "任务类型(定义数据字典)")
private Integer taskType;
/** 任务状态(定义数据字典) */
@Excel(name = "任务状态(定义数据字典)")
@ApiModelProperty(value = "任务状态(定义数据字典)")
private Integer taskStatus;
/** 任务编号，如新购单号，领料单号，退料单号等 */
@Excel(name = "任务编号")
@ApiModelProperty(value = "编号")
private String code;
/** 数据所属组织 */
@Excel(name = "数据所属组织")
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
/** 0不启用 1启用 */
@Excel(name = "0不启用 1启用")
@ApiModelProperty(value = "0不启用 1启用")
private String status;
@ApiModelProperty(value = "任务当月序号 例如:1 插入及查询时请携带任务类型")
private Integer monthOrder;
@ApiModelProperty(value = "协议id")
private Long agreementId;
@ApiModelProperty(value = "协议编号")
@Excel(name = "协议号", sort = 4)
private String agreementCode;
@ApiModelProperty(value = "领料人")
//@Excel(name = "领料人", sort = 5)
private String leasePerson;
@ApiModelProperty(value = "领料人手机号")
//@Excel(name = "联系电话", sort = 6)
private String leasePhone;
@ApiModelProperty(value = "往来单位id")
private Long unitId;
@ApiModelProperty(value = "往来单位")
//@Excel(name = "领料单位", sort = 2)
private String unitName;
@ApiModelProperty(value = "工程id")
private Long projectId;
/**
* 工程名称
*/
@ApiModelProperty(value = "工程名称")
@Excel(name = "领料工程", sort = 3)
private String projectName;
/**
* 预领料合计数
*/
@ApiModelProperty(value = "预领料合计数")
private Integer preCountNum;
@ApiModelProperty(value = "开始时间")
private String startTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
@ApiModelProperty(value = "关键字")
private String keyWord;
@ApiModelProperty(value = "领料任务汇总")
private LeaseApplyInfo leaseApplyInfo;
@ApiModelProperty(value = "领料任务物资列表")
private List<LeaseApplyDetails> leaseApplyDetailsList;
}
//package com.bonus.material.task.domain.vo;
//
//import com.bonus.common.core.annotation.Excel;
//import com.bonus.common.core.web.domain.BaseEntity;
//import com.bonus.material.lease.domain.LeaseApplyDetails;
//import com.bonus.material.lease.domain.LeaseApplyInfo;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//import java.util.List;
//
//@Data
//public class TmTaskRequestVo extends BaseEntity {
//
// /** 任务ID */
// private Long taskId;
//
// /** 任务类型(定义数据字典) */
// @Excel(name = "任务类型(定义数据字典)")
// @ApiModelProperty(value = "任务类型(定义数据字典)")
// private Integer taskType;
//
// /** 任务状态(定义数据字典) */
// @Excel(name = "任务状态(定义数据字典)")
// @ApiModelProperty(value = "任务状态(定义数据字典)")
// private Integer taskStatus;
//
// /** 任务编号，如新购单号，领料单号，退料单号等 */
// @Excel(name = "任务编号")
// @ApiModelProperty(value = "编号")
// private String code;
//
// /** 数据所属组织 */
// @Excel(name = "数据所属组织")
// @ApiModelProperty(value = "数据所属组织")
// private Long companyId;
//
// /** 0不启用 1启用 */
// @Excel(name = "0不启用 1启用")
// @ApiModelProperty(value = "0不启用 1启用")
// private String status;
//
// @ApiModelProperty(value = "任务当月序号 例如:1 插入及查询时请携带任务类型")
// private Integer monthOrder;
//
// @ApiModelProperty(value = "协议id")
// private Long agreementId;
//
// @ApiModelProperty(value = "协议编号")
// @Excel(name = "协议号", sort = 4)
// private String agreementCode;
//
// @ApiModelProperty(value = "领料人")
// //@Excel(name = "领料人", sort = 5)
// private String leasePerson;
//
// @ApiModelProperty(value = "领料人手机号")
// //@Excel(name = "联系电话", sort = 6)
// private String leasePhone;
//
// @ApiModelProperty(value = "往来单位id")
// private Long unitId;
//
// @ApiModelProperty(value = "往来单位")
// //@Excel(name = "领料单位", sort = 2)
// private String unitName;
//
// @ApiModelProperty(value = "工程id")
// private Long projectId;
//
// /**
// * 工程名称
// */
// @ApiModelProperty(value = "工程名称")
// @Excel(name = "领料工程", sort = 3)
// private String projectName;
//
// /**
// * 预领料合计数
// */
// @ApiModelProperty(value = "预领料合计数")
// private Integer preCountNum;
//
// @ApiModelProperty(value = "开始时间")
// private String startTime;
//
// @ApiModelProperty(value = "结束时间")
// private String endTime;
//
// @ApiModelProperty(value = "关键字")
// private String keyWord;
//
// @ApiModelProperty(value = "领料任务汇总")
// private LeaseApplyInfo leaseApplyInfo;
//
// @ApiModelProperty(value = "领料任务物资列表")
// private List<LeaseApplyDetails> leaseApplyDetailsList;
//}

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/task/mapper/TmTaskMapper.java
View File

@ -1,11 +1,7 @@
package com.bonus.material.task.mapper;
import java.util.List;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.task.domain.TmTask;
import com.bonus.material.task.domain.vo.TmTaskRequestVo;
import org.apache.ibatis.annotations.Param;
/**

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/ITmTaskService.java
View File

@ -2,7 +2,6 @@ package com.bonus.material.task.service;
import java.util.List;
import com.bonus.material.task.domain.TmTask;
import com.bonus.material.task.domain.vo.TmTaskRequestVo;
/**
* 任务Service接口

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/task/service/impl/TmTaskServiceImpl.java
View File

@ -1,15 +1,8 @@
package com.bonus.material.task.service.impl;
import java.util.List;
import java.util.Set;
import com.bonus.common.biz.constant.MaterialConstants;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.material.lease.domain.LeaseApplyDetails;
import com.bonus.material.lease.domain.LeaseApplyInfo;
import com.bonus.material.task.domain.vo.TmTaskRequestVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.material.task.mapper.TmTaskMapper;