diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java index 967668035..027ffb5d8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlateResList.java @@ -22,11 +22,11 @@ public class PlateResList { private String plateName; @Schema(description = "商品颜色") private String color; - @Schema(description = "商品宽") + @Schema(description = "小板宽") private String width; - @Schema(description = "商品高") + @Schema(description = "小板高") private String height; - @Schema(description = "商品厚") + @Schema(description = "小板厚") private String thickness; @Schema(description = "是否异形") private Boolean isSpecialShaped; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java index fcad6c1a1..0f80456e4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java @@ -2,6 +2,8 @@ package com.cf.imes.module.executor.dal.dataobject.process; import com.cf.imes.framework.organ.core.db.OrganBaseDO; import lombok.*; + +import java.math.BigDecimal; import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; @@ -50,7 +52,7 @@ public class OrderProcessDO extends BaseDO { /** * 板材大小 */ - private Double size; + private BigDecimal size; /** * 下一工序 ID */ diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index e7ea50334..321a3cb03 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.dal.mysql.plate; +import java.math.BigDecimal; import java.util.*; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -108,4 +109,7 @@ public interface PlateMapper extends BaseMapperX { void updateDeletedById(@Param("bodyId") Long bodyId, @Param("deleted") Integer deleted, @Param("organId") Long organId); int countPlateByOrderId(@Param("orderId") Long orderId, @Param("organId") Long organId, @Param("deleted") Integer deleted); + + + BigDecimal selectPlateSize( @Param("orderId") Long orderId); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java index 9b1bea83f..295488e36 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java @@ -5,11 +5,13 @@ import com.cf.imes.framework.common.enums.ProcessProcessingTypeEnum; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.dal.dataobject.orderBody.OrderBodyDO; import com.cf.imes.module.executor.dal.dataobject.orderGroup.OrderGroupDO; +import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; import com.cf.imes.module.executor.dal.dataobject.processStep.ProcessStepDO; import com.cf.imes.module.executor.dal.dataobject.processStepItem.OrderProcessStepItemDO; import com.cf.imes.module.executor.dal.mysql.order.OrderMapper; import com.cf.imes.module.executor.dal.mysql.orderBody.OrderBodyMapper; import com.cf.imes.module.executor.dal.mysql.orderGroup.OrderGroupMapper; +import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; import com.cf.imes.module.executor.dal.mysql.processStep.ProcessStepMapper; import com.cf.imes.module.executor.dal.mysql.processStepItem.ProcessStepItemMapper; import com.cf.imes.module.executor.enums.OrderStatusEnum; @@ -31,6 +33,7 @@ import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.executor.dal.mysql.process.OrderProcessMapper; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -72,6 +75,9 @@ public class OrderProcessServiceImpl implements OrderProcessService { @Resource private OrderBodyMapper orderBodyMapper; + @Resource + private PlateMapper plateMapper; + private static Integer INDEX = 0; @Override @@ -91,7 +97,11 @@ public class OrderProcessServiceImpl implements OrderProcessService { } // 插入 Long orderProcessId = (Long) identifierGenerator.nextId(null); - OrderProcessDO orderProcess = BeanUtils.toBean(createReqVO, OrderProcessDO.class).setId(orderProcessId); + + // 查询当前订单对应的总板材大小 + BigDecimal size = plateMapper.selectPlateSize(createReqVO.getOrderId()); + + OrderProcessDO orderProcess = BeanUtils.toBean(createReqVO, OrderProcessDO.class).setId(orderProcessId).setSize(size); List processStepDOS = new ArrayList<>(); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index f2d6472eb..447dca77d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -29,7 +29,7 @@ + + + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java index 263f5baa3..932bc62b1 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/PackController.java @@ -70,11 +70,20 @@ public class PackController { } + @GetMapping("/getOrderPlateList") + @Operation(summary = "查询多个生产单对应的板材信息") + public CommonResult> getOrdersPlateList(@Valid @RequestParam List orderIds) { + + return success(packService.getOrdersPlateList(orderIds)); + + } + + @GetMapping("/getOrderPack") @Operation(summary = "查看生产订单对应的包裹信息") @PreAuthorize("@ss.hasPermission('manage:pack:query')") - public CommonResult> getOrderPack(@Valid PackageDetailsReqVO reqVO) { - List orderPack = packService.getOrderPack(reqVO); + public CommonResult> getOrderPack(@Valid PackageDetailsReqVO reqVO) { + PageResult orderPack = packService.getOrderPack(reqVO); return success(BeanUtils.toBean(orderPack,OrderPackageVO.class)); } @@ -93,14 +102,6 @@ public class PackController { - - - - - - - - @GetMapping("/export") @Operation(summary = "导出缺板") @PreAuthorize("@ss.hasPermission('manage:pack:export')") @@ -322,11 +323,6 @@ public class PackController { - - - - - // TODO 查询接口是否需要定义 /* @GetMapping("/query") @Operation(summary = "板材列表下的查询") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java index a2408bcb8..63ab25cb4 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PackageDetailsReqVO.java @@ -1,6 +1,7 @@ package com.cf.imes.module.manage.controller.admin.pack.vo; +import com.cf.imes.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.ToString; @@ -9,7 +10,7 @@ import lombok.ToString; @Schema(description = "管理后台 - 查看生产单下对应的包裹信息") @Data @ToString(callSuper = true) -public class PackageDetailsReqVO { +public class PackageDetailsReqVO extends PageParam { @Schema(description = "生产单号", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java index d88e16b3b..16cca47f7 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/process/OrderProcessStepNDO.java @@ -8,6 +8,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; @@ -40,6 +41,11 @@ public class OrderProcessStepNDO extends BaseDO { // 计件工资 private Float pieceRate; + + // 工资金额 + private BigDecimal salaryAmount; + + // 计件工资类型 private Integer pieceType; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java index 4ea4fbd4e..222e0ea6c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java @@ -25,7 +25,7 @@ public interface OrderPackageMapper extends BaseMapperX { // } - List selectByOrderNo(@Param("reqVO") PackageDetailsReqVO reqVO,@Param("organId") Long organId); + IPage selectByOrderNo(@Param("page") IPage page,@Param("reqVO") PackageDetailsReqVO reqVO,@Param("organId") Long organId); default OrderPackageDO selectByPackNo(String packNo,Long organId) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java index 652a5db86..b729268b8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java @@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; +import java.math.BigDecimal; import java.util.List; /** @@ -24,7 +25,7 @@ public interface ProcessStepItemMapper extends BaseMapperX selectPlateName(Long processStepId); - void updateStatus(@Param("id") Long id, @Param("nickname") String nickname); + void updateStatus(@Param("id") Long id, @Param("nickname") String nickname, @Param("salary")BigDecimal salary); ProcessStepStatus selectStatusById(@Param("id") Long id,@Param("name") String name, @Param("organId") Long organId); @@ -46,4 +47,5 @@ public interface ProcessStepItemMapper extends BaseMapperX selectBodyIds(@Param("processStepId") Long processStepId,@Param("name") String name, @Param("organId") Long organId); + BigDecimal selectAreaByProcessStepId(@Param("processStepId") Long processStepId); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java index a862ff1ec..0f99a191f 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java @@ -13,6 +13,7 @@ import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -29,7 +30,7 @@ public interface ProcessStepMapper extends BaseMapperX { - void updateStatusById(@Param("id") Long id); + void updateStatusById(@Param("id") Long id, @Param("salary")BigDecimal salary); // default List selectProducitonList(Long orderNo) { // return selectList(new LambdaQueryWrapperX() @@ -45,5 +46,5 @@ public interface ProcessStepMapper extends BaseMapperX { IPage selectSalaryList( @Param("page") IPage page, @Param("pageReqVO") PriceRatePageReqVO pageReqVO,@Param("organId") Long organId); - + BigDecimal calculateSalary( @Param("processStepId") Long processStepId,@Param("area") BigDecimal area); } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java index eaa42b7b2..611309a3a 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.java @@ -74,4 +74,5 @@ public interface OrderItemMapper extends BaseMapperX { List selectPlateListByBodyIds( @Param("collect") List collect,@Param("orderId") Long orderId,@Param("userOrganId") Long userOrganId); + List selectOrdersPlateList(@Param("orderIds") List orderIds, @Param("userOrganId") Long userOrganId); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java index e08f71892..d0a00a271 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackService.java @@ -16,7 +16,7 @@ public interface PackService { // 查看生产订单对应的包裹信息 - List getOrderPack(PackageDetailsReqVO reqVO); + PageResult getOrderPack(PackageDetailsReqVO reqVO); @@ -25,6 +25,11 @@ public interface PackService { + // 查询多个生产单对应的板材信息 + List getOrdersPlateList(List orderIds); + + + // 查看板材列表分页 PageResult queryPlateDetails(OrderModuleReqVO pageReqVO); @@ -91,5 +96,4 @@ public interface PackService { OrderPackageDO addNewPartsPack(OrderPackReqVO reqVO); - } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index 43125e88a..8faa5dcc1 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -10,6 +10,7 @@ import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.manage.controller.admin.pack.vo.*; +import com.cf.imes.module.manage.controller.admin.process.vo.ProcessRespVO; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleReqVO; import com.cf.imes.module.manage.dal.dataobject.pack.OrderBodyDO; import com.cf.imes.module.manage.dal.dataobject.process.OrderDO; @@ -115,10 +116,30 @@ public class PackServiceImpl implements PackService { } + // 查询多个生产单对应的板材信息 + @Override + public List getOrdersPlateList(List orderIds) { + + return orderItemMapper.selectOrdersPlateList(orderIds,getUserOrganId()); + + } + + // 查看生产订单对应的包裹信息 @Override - public List getOrderPack(PackageDetailsReqVO reqVO) { - return orderPackageMapper.selectByOrderNo(reqVO,getUserOrganId()); + public PageResult getOrderPack(PackageDetailsReqVO reqVO) { + + PageDTO page = new PageDTO<>(reqVO.getPageNo(), reqVO.getPageSize()); + + IPage orderPackageDOIPage = orderPackageMapper.selectByOrderNo(page,reqVO, getUserOrganId()); + + + if (CollectionUtil.isEmpty(orderPackageDOIPage.getRecords())) { + return new PageResult<>(); + } + + + return new PageResult<>(orderPackageDOIPage.getRecords(), orderPackageDOIPage.getTotal()); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java index c8f93d4bc..0cb1d0839 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java @@ -12,9 +12,12 @@ import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.manage.controller.admin.process.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; import com.cf.imes.module.manage.dal.dataobject.pack.OrderBodyDO; +import com.cf.imes.module.manage.dal.dataobject.plate.OrderPlateDO; +import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO; import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepItemNDO; import com.cf.imes.module.manage.dal.mysql.pack.OrderBodyMapper; import com.cf.imes.module.manage.dal.mysql.plate.OrderPlateMapper; +import com.cf.imes.module.manage.dal.mysql.plate.PlateMapper; import com.cf.imes.module.manage.dal.mysql.process.*; import com.cf.imes.module.manage.dal.mysql.query.OrderItemMapper; import com.cf.imes.module.system.enums.ErrorCodeConstants; @@ -23,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -110,7 +114,7 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { // 工序加工添加负责人 String nickname = getLoginUser().getNickname(); - // 根据工序明细 id 查询当前生产单步骤和明细的生产状态 + // 根据工序步骤 id 查询当前生产单步骤和明细的生产状态 ProcessStepStatus processStepStatuses = processStepItemMapper.selectStatusById(reqVo.getProcessStepId(),reqVo.getName(),getUserOrganId()); @@ -132,8 +136,11 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { List orderProcessStepItemNDOS = processStepItemMapper.selectStemById(reqVo.getProcessStepId(),ProcessingStatusEnum.RAW.getStatus(),getUserOrganId()); if(orderProcessStepItemNDOS.isEmpty()){ + // 修改生产单工序步骤表的状态 - processStepMapper.updateStatusById(reqVo.getProcessStepId()); + BigDecimal salary = calculateSalary(reqVo.getProcessStepId()); + + processStepMapper.updateStatusById(reqVo.getProcessStepId(),salary); } @@ -143,8 +150,9 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { try { + BigDecimal salary = calculateSalary(reqVo.getProcessStepId()); // 修改生产明细表和步骤表的工序状态 - processStepItemMapper.updateStatus(reqVo.getProcessStepId(),nickname); + processStepItemMapper.updateStatus(reqVo.getProcessStepId(),nickname,salary); }catch (Exception e){ throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); } @@ -155,6 +163,20 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { + // 计算工资金额 + public BigDecimal calculateSalary(Long processStepId){ + + // 查询当前工序对应的板材的面积 + BigDecimal area = processStepItemMapper.selectAreaByProcessStepId(processStepId); + + + // 计算当前工序的工资金额 + BigDecimal salary = processStepMapper.calculateSalary(processStepId, area); + + return salary; + + } + // 查看板材信息的组合名称 diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml index f87495048..72d3980f7 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml @@ -27,7 +27,8 @@ SET opsi.status = TRUE, ops.status = TRUE, ops.finish_time = now(), - ops.manager = #{nickname} + ops.manager = #{nickname}, + ops.salary_amount = #{salary} WHERE ops.id = #{id}; @@ -84,4 +85,22 @@ + + + \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml index 85f8a5499..c1a8889d4 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml @@ -6,7 +6,7 @@ - UPDATE order_process_step SET status = true,finish_time = now() WHERE id = #{id} + UPDATE order_process_step SET status = true,finish_time = now(),salary_amount = #{salary} WHERE id = #{id} @@ -46,13 +46,14 @@ ops.processinfo_id as processID, ops.type as processType from order_process_step ops - join `orders` o on ops.order_id = o.id and ops.organ_id = o.organ_id + join `orders` o on ops.order_id = o.id and ops.organ_id = o.organ_id and o.deleted = 0 join order_process_step_item opsi on ops.id = opsi.process_step_id and ops.organ_id = opsi.organ_id ops.organ_id = #{organId} + and ops.processinfo_id = #{pageReqVO.processID} @@ -74,6 +75,7 @@ + order by orderId desc @@ -85,7 +87,7 @@ - + + + + + select distinct case when ops.piece_type = 1 then ops.piece_rate * count(distinct opsi.name) + else ROUND(ops.piece_rate * ROUND((op.size/ #{area}),3),3) end as rate + from order_process_step ops + join order_process_step_item opsi on ops.id = opsi.process_step_id and ops.organ_id = opsi.organ_id + join order_process op on ops.order_process_id = op.id and ops.organ_id = op.organ_id + where ops.id = #{processStepId}; + + + + + diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml index b9aed0acd..4f18c7e37 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml @@ -155,7 +155,7 @@ join order_plate op on oi.plate_id = op.id and oi.organ_id = op.organ_id join order_goods ogs on op.goods_id = ogs.id and op.organ_id = ogs.organ_id join order_body ob on oi.body_id = ob.id and oi.organ_id = ob.organ_id - join order_group og on ob.id = og.body_id and ob.organ_id = og.organ_id + left join order_group og on oi.group_id = og.id and ob.organ_id = og.organ_id where oi.order_id = #{orderNo} and oi.organ_id = #{organId} @@ -405,4 +405,46 @@ + + + \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java index 51c7312af..7e730f32f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java @@ -22,8 +22,8 @@ public class DataSourceRespVO { @ExcelProperty("数据源名称") private String name; - @Schema(description = "sql", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("sql") + @Schema(description = "sqlStr", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("sqlStr") private String sqlStr; @Schema(description = "数据源类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml index cb81e1ca9..c9e81405d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml @@ -6,7 +6,7 @@ - +