root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:重新报工，按Sn号查询

Browse Source
This commit is contained in:
zhaoyf
2026-08-05 19:30:10 +08:00
parent d26fb24ccb
commit b7e0c2b771
5 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/demand/service/impl/PmDemandServiceImpl.java
View File

@@ -122,6 +122,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
throw new BadRequestException("MES推送需求单失败，需求单已存在");
}
for (PmDemandParam pmDemandParam : param) {
if (Objects.equals(pmDemandParam.getStatus(), "1")){
pmDemandParam.setStatus(DemandStatus.CANCEL.getValue());
}
this.create(pmDemandParam);
}
}
@@ -173,6 +176,9 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
if (demand == null) {
throw new BadRequestException("需求单不存在");
}
if (Objects.equals(demand.getStatus(), DemandStatus.FINISH.getValue())){
throw new BadRequestException("单据已完成不允许分配");
}
demand.setInventory_dis(inventoryDis);
demand.setStatus(DemandStatus.DIS.getValue());
this.updateById(demand);

4
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/controller/ReceiveOutReturnController.java
View File

@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -151,7 +150,8 @@ public class ReceiveOutReturnController {
}
@PostMapping("/reSubmit")
public ResponseEntity reSubmit(HashSet<String> ids){
@Log("重新提交报工")
public ResponseEntity reSubmit(@RequestBody Set<String> ids){
receiveOutReturnService.reSubmit(ids);
return ResponseData.build();
}

4
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/dto/ReceiveOutReturnQuery.java
View File

@@ -2,12 +2,16 @@ package org.nl.wms.warehouse_manage.stockReturn.receiveOutRetur.dto;
import lombok.Data;
import java.util.List;
@Data
public class ReceiveOutReturnQuery {
private String billno;
private String orgno;
private String sn;
private String status;
private String requestId;
private String beginTime;
private String endTime;
private List<String> workArea;
}

6
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/impl/ReceiveOutReturnServiceImpl.java
View File

@@ -109,6 +109,12 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl<ReceiveOutReturnMap
if (StringUtils.hasText(query.getStatus())) {
wrapper.lambda().eq(ReceiveOutReturn::getStatus, query.getStatus());
}
if (query.getWorkArea() != null && !query.getWorkArea().isEmpty()) {
wrapper.lambda().in(ReceiveOutReturn::getWorkArea, query.getWorkArea());
}
if (StringUtils.hasText(query.getSn())) {
wrapper.lambda().eq(ReceiveOutReturn::getSn, query.getSn());
}
if (StringUtils.hasText(query.getRequestId())) {
wrapper.lambda().like(ReceiveOutReturn::getRequestId, query.getRequestId());
}