Compare commits

..

No commits in common. 'b6d705030f0fec12290d10adbacb6c7711c06e42' and 'b97ac405b9eca47d052a9ef5b2a891f101374358' have entirely different histories.

@ -127,7 +127,6 @@ public class IoCollectOrderBackupController extends BaseController {
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@Resource @Resource
private ErpBasicClient erpBasicClient; private ErpBasicClient erpBasicClient;
/** /**
@ -138,7 +137,6 @@ public class IoCollectOrderBackupController extends BaseController {
*/ */
@Resource @Resource
private IoCollectOrderBackupMapper ioCollectOrderBackupMapper; private IoCollectOrderBackupMapper ioCollectOrderBackupMapper;
@PostMapping("/udiwms/basic/collect/order/orderMedicalDelete") @PostMapping("/udiwms/basic/collect/order/orderMedicalDelete")
public BaseResponse orderMedicalDelete(@RequestBody CollectOrderRequest collectOrderRequest) { public BaseResponse orderMedicalDelete(@RequestBody CollectOrderRequest collectOrderRequest) {
PostOrderMedicalDeleteRequest postOrderMedicalDeleteRequest = new PostOrderMedicalDeleteRequest(); PostOrderMedicalDeleteRequest postOrderMedicalDeleteRequest = new PostOrderMedicalDeleteRequest();
@ -156,7 +154,6 @@ public class IoCollectOrderBackupController extends BaseController {
return baseResponse; return baseResponse;
} }
/** /**
* *
* *
@ -241,6 +238,7 @@ public class IoCollectOrderBackupController extends BaseController {
} }
@PostMapping("/udiwms/basic/collect/orderFinish/orderStats") @PostMapping("/udiwms/basic/collect/orderFinish/orderStats")
public BaseResponse orderStats(@RequestBody CollectOrderRequest collectOrderRequest) { public BaseResponse orderStats(@RequestBody CollectOrderRequest collectOrderRequest) {
List<Long> workPlaceCodes = null; List<Long> workPlaceCodes = null;
@ -253,4 +251,6 @@ public class IoCollectOrderBackupController extends BaseController {
} }
} }

@ -692,7 +692,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void finishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin, Boolean isAuto) { public void finishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin, Boolean isAuto) {
IoCollectSet collectSet = collectSetService.getSet();
IoCollectOrder collectOrder = new IoCollectOrder(); IoCollectOrder collectOrder = new IoCollectOrder();
BeanUtils.copyProperties(collectOrderRequest, collectOrder); BeanUtils.copyProperties(collectOrderRequest, collectOrder);
collectOrder.setTagStatus(3); collectOrder.setTagStatus(3);
@ -740,10 +739,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(), collectOrderRequest.getIsCheckFinish()); collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo(), collectOrderRequest.getIsCheckFinish());
//删除原来单据 //删除原来单据
removeOrderByBillNo(finalCollectOrder); removeOrderByBillNo(finalCollectOrder);
if (IntUtil.value(collectSet.getDelayTageCode()) && sysWorkplaceDocumentEntity.getDocumentTypeCode().startsWith("YPCF")) {
//校验拆零是否都已赋码 //校验拆零是否都已赋码
splitCodeService.delaySplitVail(ioCollectOrderBackup); splitCodeService.delaySplitVail(ioCollectOrderBackup);
}
//更新数据至第三方系统 //更新数据至第三方系统
//单据更新 //单据更新

@ -281,7 +281,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
filterUdiRelRequest.setPackLevel("1"); filterUdiRelRequest.setPackLevel("1");
//todo 后面可以 没有搜索到层级为1的 //todo 后面可以 没有搜索到层级为1的
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectOneUdi(filterUdiRelRequest); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectOneUdi(filterUdiRelRequest);
if (IntUtil.value(udiRelevanceResponse.getNotCodeType()) != 0 && IntUtil.value(collectSet.getNoCodeScan())) { if (IntUtil.value(udiRelevanceResponse.getNotCodeType()) != 0) {
collectOrderBiz.setTagStatus(4);//无需扫码 collectOrderBiz.setTagStatus(4);//无需扫码
collectOrderBizService.updateById(collectOrderBiz); collectOrderBizService.updateById(collectOrderBiz);
continue; continue;

Loading…
Cancel
Save