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

4/5 扫码退货优化1.0

Browse Source
dev_2.5_csconfilt
wangwei 3 months ago
parent b4c065a14f
commit 933970a05c
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
Unescape Escape View File

@ -628,7 +628,7 @@ public class IoCollectOrderController extends BaseController {
@PostMapping("/udiwms/basic/collect/order/finishReturnOrder")
@Transactional(rollbackFor = Exception.class)
public BaseResponse finishReturnOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
return collectOriginService.submitreturnOrder(collectOrderRequest);
return collectOriginService.submitreturnOrder(collectOrderRequest,1);
}

2
src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
Unescape Escape View File

@ -326,6 +326,6 @@ public class IoCollectOriginController extends BaseController {
@PostMapping("/udiwms/basic/collect/origin/order/returnSubmit")
public BaseResponse returnOrderSubmit(@RequestBody CollectOrderRequest collectOrderRequest) {
//假数据设置
return collectOriginService.submitreturnOrder(collectOrderRequest);
return collectOriginService.submitreturnOrder(collectOrderRequest,2);
}
}

24
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -14,10 +14,7 @@ import com.glxp.api.constant.Constant;
import com.glxp.api.constant.WorkOperType;
import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper;
import com.glxp.api.entity.auth.SysWorkplace;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
import com.glxp.api.entity.basic.SysWorkplacePutRel;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.collect.*;
import com.glxp.api.entity.inout.IoCodeLostEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
@ -207,6 +204,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
throw new JsonException(500, "当前追溯码非原始处方追溯码");
}
IoCollectCodeResponse ioCollectCodeResponse = ioCollectCodeResponses.get(0);
// if (ioCollectCodeResponse.getReCount() != 0 || ioCollectCodeResponse.getReCount() != null){
// //扫入的为拆零码
// //这个为 退货的数量 如果退货数量 是
// Integer count = collectOrderBiz1.getCount();
// }
if (!ioCollectCodeResponse.getCode().equals(code)){
throw new JsonException(500, "当前追溯码非原始处方追溯码");
}
@ -473,14 +475,16 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
int count = IntUtil.value(collectOrderBiz.getScanCount()) + 1;
int actCount = 0;
actCount = IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount;
if (actCount > IntUtil.value(collectOrderBiz.getCount())) {
int needCount = IntUtil.value(collectOrderBiz.getCount()) - IntUtil.value(collectOrderBiz.getScanActCount());
if (needCount > 0) {
if (vailInSplit(collectOrderBiz, putWorkPlaceCode, needCount)) {
throw new JsonException(502, collectOrderBiz.getCpmctymc() + "当前拆零数量还有剩余，是否继续扫码进行拆零？");
if (!addTagCodeReqeust.getBusType().startsWith("YPCFTF")) {
if (actCount > IntUtil.value(collectOrderBiz.getCount())) {
int needCount = IntUtil.value(collectOrderBiz.getCount()) - IntUtil.value(collectOrderBiz.getScanActCount());
if (needCount > 0) {
if (vailInSplit(collectOrderBiz, putWorkPlaceCode, needCount)) {
throw new JsonException(502, collectOrderBiz.getCpmctymc() + "当前拆零数量还有剩余，是否继续扫码进行拆零？");
}
}
throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
}
throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
}
collectOrderBiz.setAddScanCount(1);
collectOrderBiz.setAddScanActCount(scanCount);

16
src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
Unescape Escape View File

@ -240,7 +240,7 @@ public class IoCollectOriginService {
}
@Transactional(rollbackFor = Exception.class)
public BaseResponse submitreturnOrder(CollectOrderRequest collectOrderRequest) {
public BaseResponse submitreturnOrder(CollectOrderRequest collectOrderRequest,Integer type) {
if (StrUtil.isBlank(collectOrderRequest.getBillNo())) {
return ResultVOUtils.error(500, "单据号不能为空");
}
@ -327,13 +327,22 @@ public class IoCollectOriginService {
// }else {
// //整取
// }
IoCollectCodeBackup collectCodeBackup = new IoCollectCodeBackup();
BeanUtils.copyProperties(ioCollectCodeResponse,collectCodeBackup);
collectCodeBackup.setBillNo(collectOrder.getBillNo());
collectCodeBackup.setId(null);
collectCodeBackup.setBusType(collectOrder.getBusType());
collectCodeBackup.setRelId(Long.valueOf(ioCollectCodeResponse.getRelId()));
ioCollectCodeBackups.add(collectCodeBackup);
IoCollectOrderCodeMan one = ioCollectOrderCodeManService.getOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
.eq(IoCollectOrderCodeMan::getOrderIdFk, collectOrder.getBillNo())
.eq(IoCollectOrderCodeMan::getUdiCode, ioCollectCodeResponse.getCode()));
if (type == 1 && one != null){
//手动扫码退货
ioCollectCodeBackups.add(collectCodeBackup);
}else if (type == 2){
ioCollectCodeBackups.add(collectCodeBackup);
}
}
@ -347,6 +356,7 @@ public class IoCollectOriginService {
orderBackup.setWorkPlaceCode(prescriptionOrder.getWorkPlaceCode());
ioCollectOrderBackupService.save(orderBackup);
List<IoCollectOrderBiz> ioCollectOrderBizs = collectOrderBizService.listByBillNo(ioCollectOrder.getBillNo());
List<IoCollectOrderCodeMan> list = ioCollectOrderCodeManService.list(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getOrderIdFk, collectOrder.getBillNo()));
ArrayList<IoCollectOrderBizBackup> ioCollectOrderBizBackups = new ArrayList<>();
for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){
IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
@ -358,7 +368,7 @@ public class IoCollectOriginService {
collectOrderOriginService.updateById(collectOrder);
ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups);
collectOrderService.removeOrderByBillNo(ioCollectOrder);
List<IoCollectOrderCodeMan> list = ioCollectOrderCodeManService.list(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getOrderIdFk, collectOrder.getBillNo()));
if (list.size() > 0){
ioCollectOrderCodeManService.removeByBillNo(collectOrder.getBillNo());
}

Write Preview
Loading…
Cancel
Save