bug修改

test
anthonywj 2 years ago
parent d19f96d2ca
commit b23d7397bb

@ -184,7 +184,6 @@ public class BasicBussinessTypeEntity {
private String supplementOrderType;
/**
*
*/
@ -280,6 +279,21 @@ public class BasicBussinessTypeEntity {
*/
@TableField(value = "checkCopy")
private int checkCopy;
/**
*
*/
@TableField(value = "checkReview")
private int checkReview;
/**
*
*/
@TableField(value = "secCheckReview")
private boolean seccheckReview;
/**
*
*/
@TableField(value = "thrCheckReview")
private boolean thrCheckReview;
/**
*
@ -414,4 +428,6 @@ public class BasicBussinessTypeEntity {
//是否按货位出库 0不按货位出库1:按货位出库
@TableField(value = "spaceOut")
private int spaceOut;
}

@ -152,7 +152,17 @@ public class BasicBussinessTypeResponse {
private String checkPreInOrders;
private Boolean advancePreIn;
private Integer sortNum;
private int spaceOut;
/**
*
*/
private int checkReview;
/**
*
*/
private boolean seccheckReview;
/**
*
*/
private boolean thrCheckReview;
}

@ -126,6 +126,10 @@ public class IoCheckInoutService {
if (bussinessTypeEntity.getCheckCopy() == 0) {
return false;
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (bussinessTypeEntity.getCheckReview() == 0) {
return false;
}
}
return true;
}
@ -196,6 +200,11 @@ public class IoCheckInoutService {
unCheckFirstFinish(orderEntity);
return;
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (bussinessTypeEntity.getCheckReview() == 0) {
unCheckFirstFinish(orderEntity);
return;
}
}
checkFirstFinish(orderEntity);
}
@ -218,6 +227,10 @@ public class IoCheckInoutService {
codeLostEntity.setId(IdUtil.getSnowflakeNextId());
codeLostEntity.setNameCode(udiEntity.getUdi());
codeLostEntity.setCode(codeEntity.getCode());
codeLostEntity.setBatchNo(codeEntity.getBatchNo());
codeLostEntity.setProduceDate(codeEntity.getProduceDate());
codeLostEntity.setExpireDate(codeEntity.getExpireDate());
codeLostEntity.setSerialNo(codeEntity.getSerialNo());
}
//校验是否写入缺失表
boolean isTrue = false;
@ -773,6 +786,10 @@ public class IoCheckInoutService {
if (!bussinessTypeEntity.isThrCheckSp()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (!bussinessTypeEntity.isThrCheckReview()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
}
}
} else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
@ -833,6 +850,10 @@ public class IoCheckInoutService {
if (!bussinessTypeEntity.isSecCheckSp()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (!bussinessTypeEntity.isSeccheckReview()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
}
}
} else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);

@ -441,3 +441,7 @@ CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);

Loading…
Cancel
Save