bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-07-17 09:11:05 +08:00
parent 586b2ffe38 8b363e5698
commit 6d233fe985
7 changed files with 44 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportProductionPlanController.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportPlanController.java
View File

@ -1,13 +1,10 @@
package com.bonus.canteen.core.ims.controller;
import com.bonus.canteen.core.ims.domain.param.ProductionPlanQuery;
import com.bonus.canteen.core.ims.domain.param.ReportProductionPlanQuery;
import com.bonus.canteen.core.ims.domain.param.ReportPurchasePlanQuery;
import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO;
import com.bonus.canteen.core.ims.service.IProductionPlanService;
import com.bonus.canteen.core.ims.service.IReportProductionPlanService;
import com.bonus.canteen.core.ims.service.IReportPlanService;
import com.bonus.common.core.web.controller.BaseController;
import com.bonus.common.core.web.page.TableDataInfo;
import io.swagger.annotations.Api;
@ -30,16 +27,16 @@ import java.util.List;
@Api(tags = "生产计划主接口")
@RestController
@RequestMapping("/report")
public class ReportProductionPlanController extends BaseController {
public class ReportPlanController extends BaseController {
@Autowired
private IReportProductionPlanService reportProductionPlanService;
private IReportPlanService reportPlanService;
@ApiOperation(value = "查询生产计划报表")
//@RequiresPermissions("ims:plan:list")
@PostMapping("/ims_production_plan/list")
public TableDataInfo list(@RequestBody @Valid ReportProductionPlanQuery productionPlan) {
startPage();
List<ReportProductionPlanVO> list = reportProductionPlanService.selectProductionPlanList(productionPlan);
List<ReportProductionPlanVO> list = reportPlanService.selectProductionPlanList(productionPlan);
return getDataTable(list);
}
@ -48,7 +45,7 @@ public class ReportProductionPlanController extends BaseController {
@PostMapping("/ims_purchase_plan/list")
public TableDataInfo list(@RequestBody @Valid ReportPurchasePlanQuery productionPlan) {
startPage();
List<ReportPurchasePlanVO> list = reportProductionPlanService.selectPurchasePlanList(productionPlan);
List<ReportPurchasePlanVO> list = reportPlanService.selectPurchasePlanList(productionPlan);
return getDataTable(list);
}
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportProductionPlanMapper.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportPlanMapper.java
View File

@ -1,9 +1,7 @@
package com.bonus.canteen.core.ims.mapper;
import com.bonus.canteen.core.ims.domain.ProductionPlan;
import com.bonus.canteen.core.ims.domain.param.ReportProductionPlanQuery;
import com.bonus.canteen.core.ims.domain.param.ReportPurchasePlanQuery;
import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO;
@ -15,7 +13,7 @@ import java.util.List;
* @author xsheng
* @date 2025-07-14
*/
public interface ReportProductionPlanMapper {
public interface ReportPlanMapper {
List<ReportProductionPlanVO> selectProductionPlanList(ReportProductionPlanQuery productionPlan);
List<ReportPurchasePlanVO> selectPurchasePlanList(ReportPurchasePlanQuery productionPlan);

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportProductionPlanService.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportPlanService.java
View File

@ -1,7 +1,6 @@
package com.bonus.canteen.core.ims.service;
import com.bonus.canteen.core.ims.domain.param.*;
import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO;
@ -13,7 +12,7 @@ import java.util.List;
* @author xsheng
* @date 2025-07-14
*/
public interface IReportProductionPlanService {
public interface IReportPlanService {
List<ReportProductionPlanVO> selectProductionPlanList(ReportProductionPlanQuery productionPlan);
List<ReportPurchasePlanVO> selectPurchasePlanList(ReportPurchasePlanQuery productionPlan);
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java
View File

@ -94,6 +94,9 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService {
inspectGoods.setInspectGoodsId(null);
inspectGoods.setCreateTime(DateUtils.getNowDate());
inspectGoods.setCreateBy(SecurityUtils.getUsername());
if(StringUtils.isNotBlank(inspectGoods.getRelateOrderGoodsId())) {
inspectGoods.setInspector(StringUtils.EMPTY);
}
try {
String inspectGoodsCode = NoGenerateUtils.generateInspectGoodsCode();
inspectGoods.setInspectGoodsCode(inspectGoodsCode);

33
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java Normal file
View File

@ -0,0 +1,33 @@
package com.bonus.canteen.core.ims.service.impl;
import com.bonus.canteen.core.ims.domain.param.*;
import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO;
import com.bonus.canteen.core.ims.mapper.ReportPlanMapper;
import com.bonus.canteen.core.ims.service.IReportPlanService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 生产计划主Service业务层处理
*
* @author xsheng
* @date 2025-07-14
*/
@Service
public class ReportPlanServiceImpl implements IReportPlanService {
@Autowired
private ReportPlanMapper reportPlanMapper;
@Override
public List<ReportProductionPlanVO> selectProductionPlanList(ReportProductionPlanQuery productionPlan) {
return reportPlanMapper.selectProductionPlanList(productionPlan);
}
@Override
public List<ReportPurchasePlanVO> selectPurchasePlanList(ReportPurchasePlanQuery productionPlan) {
return reportPlanMapper.selectPurchasePlanList(productionPlan);
}
}

55
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportProductionPlanServiceImpl.java
View File

@ -1,55 +0,0 @@
package com.bonus.canteen.core.ims.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.ims.domain.ProductionPlan;
import com.bonus.canteen.core.ims.domain.ProductionPlanDetail;
import com.bonus.canteen.core.ims.domain.ProductionPurchaseOrder;
import com.bonus.canteen.core.ims.domain.param.*;
import com.bonus.canteen.core.ims.domain.vo.ProductionPlanDetailVO;
import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO;
import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO;
import com.bonus.canteen.core.ims.enums.SupplierOrderGenerateTypeEnum;
import com.bonus.canteen.core.ims.mapper.ProductionPlanDetailMapper;
import com.bonus.canteen.core.ims.mapper.ProductionPlanMapper;
import com.bonus.canteen.core.ims.mapper.ReportProductionPlanMapper;
import com.bonus.canteen.core.ims.service.IProductionPlanDetailService;
import com.bonus.canteen.core.ims.service.IProductionPlanService;
import com.bonus.canteen.core.ims.service.IProductionPurchaseOrderService;
import com.bonus.canteen.core.ims.service.IReportProductionPlanService;
import com.bonus.canteen.core.ims.utils.NoGenerateUtils;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 生产计划主Service业务层处理
*
* @author xsheng
* @date 2025-07-14
*/
@Service
public class ReportProductionPlanServiceImpl implements IReportProductionPlanService {
@Autowired
private ReportProductionPlanMapper reportProductionPlanMapper;
@Override
public List<ReportProductionPlanVO> selectProductionPlanList(ReportProductionPlanQuery productionPlan) {
return reportProductionPlanMapper.selectProductionPlanList(productionPlan);
}
@Override
public List<ReportPurchasePlanVO> selectPurchasePlanList(ReportPurchasePlanQuery productionPlan) {
return reportProductionPlanMapper.selectPurchasePlanList(productionPlan);
}
}

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportProductionPlanMapper.xml → bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.ims.mapper.ReportProductionPlanMapper">
<mapper namespace="com.bonus.canteen.core.ims.mapper.ReportPlanMapper">
<select id="selectProductionPlanList" parameterType="com.bonus.canteen.core.ims.domain.param.ReportProductionPlanQuery" resultType="com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO">
select