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