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

opt:优化推送时关联单据号

Browse Source
This commit is contained in:
zhangzq
2026-07-28 15:34:09 +08:00
parent 334c557a55
commit a850446e3a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java
View File

@@ -355,7 +355,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService {
receiveOutRequest.setDeptno("01.09.14.02"); receiveOutRequest.setDeptno("01.09.14.02");
receiveOutRequest.setEntrys(entrys); receiveOutRequest.setEntrys(entrys);
ReceiveOutReturn entity = receiveOutReturnService.saveFromRequest( ReceiveOutReturn entity = receiveOutReturnService.saveFromRequest(
receiveOutRequest, StockReturnStatusEnum.TODO.getCode(), null); receiveOutRequest, StockReturnStatusEnum.TODO.getCode(), null,param.getWorkOrder());
return PdaResponse.requestOk(); return PdaResponse.requestOk();
} }

2
nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/stockReturn/receiveOutRetur/service/IReceiveOutReturnService.java
View File

@@ -25,7 +25,7 @@ public interface IReceiveOutReturnService extends IService<ReceiveOutReturn> {
void delete(Set<Long> ids); void delete(Set<Long> ids);
ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark); ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark, String workOrder);
void updateUploadResult(Long id, String status, String remark); void updateUploadResult(Long id, String status, String remark);

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

@@ -138,7 +138,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl<ReceiveOutReturnMap
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark) { public ReceiveOutReturn saveFromRequest(ReceiveOutRequest request, String status, String remark, String workOrder) {
ReceiveOutReturn entity = new ReceiveOutReturn(); ReceiveOutReturn entity = new ReceiveOutReturn();
entity.setOrgno(request.getOrgno()); entity.setOrgno(request.getOrgno());
entity.setBillno(request.getBillno()); entity.setBillno(request.getBillno());
@@ -154,7 +154,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl<ReceiveOutReturnMap
entity.setCreateTime(DateUtil.now()); entity.setCreateTime(DateUtil.now());
entity.setRemark(limitText(remark, 1000)); entity.setRemark(limitText(remark, 1000));
entity.setStatus(status); entity.setStatus(status);
entity.setRequestId(request.getBillno()); entity.setRequestId(workOrder);
entity.setCreatedBy(SecurityUtils.getCurrentUsername()); entity.setCreatedBy(SecurityUtils.getCurrentUsername());
this.save(entity); this.save(entity);
saveRequestDetails(entity.getId(), request.getEntrys(), status, remark); saveRequestDetails(entity.getId(), request.getEntrys(), status, remark);
@@ -392,7 +392,7 @@ public class ReceiveOutReturnServiceImpl extends ServiceImpl<ReceiveOutReturnMap
private ReceiveOutRequest buildRequest(ReceiveOutReturn entity, List<ReceiveOutReturnDetail> details) { private ReceiveOutRequest buildRequest(ReceiveOutReturn entity, List<ReceiveOutReturnDetail> details) {
ReceiveOutRequest request = new ReceiveOutRequest(); ReceiveOutRequest request = new ReceiveOutRequest();
request.setOrgno(entity.getOrgno()); request.setOrgno(entity.getOrgno());
request.setBillno(""); request.setBillno(entity.getBillno());
request.setBiztype(entity.getBiztype()); request.setBiztype(entity.getBiztype());
request.setInvscheme(entity.getInvscheme()); request.setInvscheme(entity.getInvscheme());
request.setTranstype(entity.getTranstype()); request.setTranstype(entity.getTranstype());