Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道Bug修改

Browse Source
This commit is contained in:
liuzhaotian
2024-06-28 17:12:21 +08:00
parent 9d3682a3f9
commit a4342d0126
8 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/GoodsIds.java
+25
View File
@@ -0,0 +1,25 @@
package com.cf.imes.module.executor.controller.admin.plan.bo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class GoodsIds {
@Schema(description = "大板ID")
private Long id;
@Schema(description = "生产单ID")
private Long orderId;
@Schema(description = "板材库的大板ID")
private Long goodsId;
@Schema(description = "余料板ID")
private Long remainId;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java
+9
View File
@@ -16,6 +16,8 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -40,6 +42,11 @@ public class OrderSource {
@Schema(description = "排单数据")
private PlanDO plan;
@Schema(description = "大板ID列表")
private List<GoodsIds> goodsIdList;
@Schema(description = "生产单列表")
private List<OrderDO> orderList;
@@ -61,4 +68,6 @@ public class OrderSource {
private List<PrintOrderPackReqVO> orderPackReqVOS;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java
+2 -2
View File
@@ -32,8 +32,8 @@ public class OrderPageReqVOCopy extends PageParam {
private String consigneeAddress;
@Schema(description = "状态列表")
private List<Integer> stateList;
/*@Schema(description = "矩形")
private Boolean rectangle;*/
@Schema(description = "矩形")
private Boolean rectangle;
@Schema(description = "异形")
private Boolean specialShaped;
@Schema(description = "造型")
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class PlateDetailsRespVO {
@Schema(description = "排孔", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("排孔")
private String rowHole;
private Boolean rowHole;
@Schema(description = "加工组", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("加工组")
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/query/vo/pack/PackageDetailsRespVO.java
+4
View File
@@ -14,6 +14,10 @@ public class PackageDetailsRespVO {
@Schema(description = "柜体名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String cabinetName;
@Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED)
private String plateId;
@Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED)
private String plateNo;
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml
+7 -8
View File
@@ -6,7 +6,8 @@
<resultMap id="orderItemMap" type="com.cf.imes.module.manage.controller.admin.query.vo.pack.PackageDetailsRespVO">
<result property="roomName" column="roomName"/>
<result property="cabinetName" column="bodyName"/>
<result property="plateNo" column="palteId"/>
<result property="plateId" column="plateId"/>
<result property="plateNo" column="plateNo"/>
<result property="plateName" column="plateName"/>
<result property="material" column="plateMaterial"/>
<result property="color" column="palteColor"/>
@@ -32,7 +33,8 @@
og.name as name,
ob.room_name as roomName,
ob.name as bodyName,
op.id as palteId,
op.plate_no as plateNo,
op.id as plateId,
op.name as plateName,
ogs.material as plateMaterial,
ogs.color as palteColor,
@@ -44,8 +46,7 @@
op.remark as remark,
op.is_special_shaped as specialShaped,
op.is_sculpt as profiling,
CASE WHEN op.front_hole_count = 0 or op.back_model_count = 0 or op.side_hole_count = 0 THEN false ELSE true END AS rowHole
op.is_row_hole as rowHole
from order_item oi
join order_plate op on oi.plate_id = op.id and oi.organ_id = op.organ_id
@@ -150,8 +151,7 @@
op.remark as remark,
op.is_special_shaped as specialShaped,
op.is_sculpt as profiling,
CASE WHEN op.front_hole_count = 0 or op.back_model_count = 0 or op.side_hole_count = 0 THEN false ELSE true END AS rowHole
op.is_row_hole as rowHole
from order_item oi
join order_plate op on oi.plate_id = op.id and oi.organ_id = op.organ_id
@@ -433,8 +433,7 @@
op.remark as remark,
op.is_special_shaped as specialShaped,
op.is_sculpt as profiling,
CASE WHEN op.front_hole_count = 0 or op.back_model_count = 0 or op.side_hole_count = 0 THEN false ELSE true END AS rowHole
op.is_row_hole as rowHole
from order_item oi
join order_plate op on oi.plate_id = op.id and oi.organ_id = op.organ_id
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/process/ProcessApiImpl.java
+2 -1
View File
@@ -31,7 +31,8 @@ public class ProcessApiImpl implements ProcessApi {
ProcessDO processDO = processMapper.selectByType(ProcessProcessingTypeEnum.COMPONENTPROCESSING.getNumber(),getUserOrganId());
return processDO.getPieceRate();
return processDO == null ? BigDecimal.ZERO : processDO.getPieceRate();
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
+3 -1
View File
@@ -363,7 +363,9 @@ public class AdminUserServiceImpl implements AdminUserService {
// 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确
DataPermissionUtils.executeIgnore(() -> {
// 校验用户的密码是否符合规则
validatePassword(password);
if(password != null) {
validatePassword(password);
}
// 校验用户存在
validateUserExists(id);
// 校验用户名唯一