UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预验收选入时增加过滤条件

Browse Source
dev2.0
anthonywj 2 years ago
parent 6a3d9113f6
commit 5a22d137d8
11 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File

16
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -586,9 +586,9 @@ public class IoCodeTempController extends BaseController {
BaseResponse invRes = null;
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
} else {
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
}
@ -742,13 +742,13 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) {
deleteEmptyBillNo(orderEntity);
return invRes;
}
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) {
deleteEmptyBillNo(orderEntity);
return invRes;
@ -1574,9 +1574,9 @@ public class IoCodeTempController extends BaseController {
BaseResponse invRes = null;
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity, false);
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity, false);
} else {
invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
}
@ -1729,13 +1729,13 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存
BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) {
deleteEmptyBillNo(orderEntity);
return invRes;
}
} else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存
BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity, false);
if (invRes != null) {
deleteEmptyBillNo(orderEntity);
return invRes;

2
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -174,8 +174,6 @@ public class IoOrderController extends BaseController {
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/preInorder/filter")
public BaseResponse filterPreInorder(FilterOrderRequest filterOrderRequest) {
filterOrderRequest.setVueType(Constant.ORDER_ACTION_SUP_PREIN);
orderService.setActions(filterOrderRequest);
List<IoOrderResponse> list = orderService.filterList(filterOrderRequest);

7
src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
Unescape Escape View File

@ -275,4 +275,11 @@ public class IoOrderEntity {
private String fromSpmsOrders;
/**
* 是否已被选入
*/
@TableField(value = "preInSelected")
private Integer preInSelected;
}

1
src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
Unescape Escape View File

@ -199,4 +199,5 @@ public class FilterOrderRequest extends ListPageRequest {
private String remark;
private String keyWords;
private Integer confirmStatus;
private Boolean filterSelected;
}

5
src/main/java/com/glxp/api/req/inout/OrderEditRequest.java
Unescape Escape View File

@ -20,6 +20,11 @@ public class OrderEditRequest {
*/
private String auditTime;
/**
* 是否已被选入
*/
private Integer preInSelected;
/**
* 单号集合
*/

8
src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
Unescape Escape View File

@ -213,7 +213,6 @@ public class IoOrderResponse {
private String customerName;
/**
* 导出状态/上传状态（0.未导出，1.已导出，2.导出失败）
*/
@ -244,6 +243,11 @@ public class IoOrderResponse {
private int invoiceStatus;//发票登记状态0：未登记，1：未全部登记；2：已全部登记
/**
* 是否已被选入
*/
private Integer preInSelected;
private String fromSpmsOrders; //自助单据号
@ -257,7 +261,7 @@ public class IoOrderResponse {
}
public Integer getExportStatus() {
if(exportStatus == null){
if (exportStatus == null) {
return 0;
}
return exportStatus;

11
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
import com.glxp.api.req.inout.OrderEditRequest;
import com.glxp.api.res.inout.IoOrderCheckResultResponse;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
@ -927,7 +928,6 @@ public class IoCheckInoutService {
List<String> orderList = CollUtil.toList(orderIdArray);
List<IoCodeEntity> outCodeEntitys = codeService.findByOrderId(orderEntity.getBillNo());
List<IoCodeEntity> preInCodeEntities = codeService.findByOrderIds(orderList, null);
// 扣减数量
for (IoCodeEntity preInCodeEntity : preInCodeEntities) {
for (IoCodeEntity codeEntity : outCodeEntitys) {
@ -955,16 +955,19 @@ public class IoCheckInoutService {
}
}
List<IoCodeEntity> backCodeList = new ArrayList<>();
for (IoCodeEntity codeEntity : preInCodeEntities) {
if (codeEntity.getMyCount() > 0) {
backCodeList.add(codeEntity);
}
}
genBackOrder(orderEntity, backCodeList);
//更新预验收单为已被选入
OrderEditRequest orderEditRequest = new OrderEditRequest();
orderEditRequest.setOrderIds(orderList);
orderEditRequest.setPreInSelected(1);
orderService.updateBatchOrder(orderEditRequest);
genBackOrder(orderEntity, backCodeList);
}

3
src/main/java/com/glxp/api/service/inout/IoOrderService.java
Unescape Escape View File

@ -115,6 +115,9 @@ public interface IoOrderService {
*/
void updateOrderInfo(OrderEditRequest orderEditRequest);
void updateBatchOrder(OrderEditRequest orderEditRequest);
/**
* 查询上传单据列表
*

7
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -817,6 +817,13 @@ public class IoOrderServiceImpl implements IoOrderService {
orderDao.update(order, new QueryWrapper<IoOrderEntity>().in("billNo", orderEditRequest.getOrderIds()));
}
@Override
public void updateBatchOrder(OrderEditRequest orderEditRequest) {
IoOrderEntity order = new IoOrderEntity();
order.setPreInSelected(orderEditRequest.getPreInSelected());
orderDao.update(order, new QueryWrapper<IoOrderEntity>().in("billNo", orderEditRequest.getOrderIds()));
}
@Override
public List<IoOrderResponse> filterUploadOrderList(FilterUploadOrderRequest uploadOrderRequest) {
if (null == uploadOrderRequest) {

3
src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
Unescape Escape View File

@ -66,6 +66,9 @@
<if test="relKey != null">
AND relKey = #{relKey}
</if>
<if test="filterSelected != null and filterSelected == true">
AND io.preInSelected is null
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
date_format(#{endTime}, '%Y-%m-%d')

7
src/main/resources/schemas/schema_v2.2.sql
Unescape Escape View File

@ -83,3 +83,10 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('io_order', 'preInSelected', 'tinyint', 1);
#
# update io_order set preInSelected = 1 WHERE io_order.billNo in (select checkPreInOrders from (select checkPreInOrders from io_order WHERE checkPreInOrders is not null GROUP BY checkPreInOrders) a) ;

Write Preview
Loading…
Cancel
Save