|
|
|
@ -76,8 +76,8 @@ import java.util.regex.Matcher;
|
|
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* tradeupload
|
|
|
|
|
*
|
|
|
|
|
* @版本: V3.2.0
|
|
|
|
|
* @版权: LINKAGE-BOOT
|
|
|
|
|
* @作者: LINKAGE-BOOT研发团队
|
|
|
|
@ -472,6 +472,7 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
return vo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 磅单识别
|
|
|
|
|
*
|
|
|
|
@ -536,6 +537,7 @@ public class TradeuploadController {
|
|
|
|
|
tradeuploadCrForm.setBusinessId(userInfo.getUserName());
|
|
|
|
|
return ActionResult.success(tradeuploadCrForm);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 批量审核
|
|
|
|
|
*
|
|
|
|
@ -635,7 +637,6 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 模板下载
|
|
|
|
|
*
|
|
|
|
@ -654,6 +655,7 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 导出Excel
|
|
|
|
|
*
|
|
|
|
@ -707,6 +709,7 @@ public class TradeuploadController {
|
|
|
|
|
DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), mapList, keys, userInfo);
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//导出表格
|
|
|
|
|
public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) {
|
|
|
|
|
DownloadVO vo = DownloadVO.builder().build();
|
|
|
|
@ -941,8 +944,6 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 更新
|
|
|
|
|
*
|
|
|
|
@ -973,9 +974,9 @@ public class TradeuploadController {
|
|
|
|
|
QueryWrapper<PurchaseorderEntity> PurchaseorderqueryWrapper = new QueryWrapper<>();
|
|
|
|
|
PurchaseorderqueryWrapper.lambda().eq(PurchaseorderEntity::getId, entity.getPurchaseorderId());
|
|
|
|
|
List<PurchaseorderEntity> Pur = purchaseorderService.list(PurchaseorderqueryWrapper);
|
|
|
|
|
if (Pur.size() > 0) {
|
|
|
|
|
int s = Integer.valueOf(Pur.get(0).getIsPayment());
|
|
|
|
|
if (list != null && list.get(0).getPurchaseorderId() != null && s == 1) {
|
|
|
|
|
|
|
|
|
|
int s21 = Integer.valueOf(tradeuploadUpForm.getCustomerId());
|
|
|
|
|
int s22 = Integer.valueOf(list.get(0).getCustomerId());
|
|
|
|
|
if (s21 == s22) {
|
|
|
|
@ -986,6 +987,7 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tradeuploadService.update(id, subentity);
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
@ -995,7 +997,6 @@ public class TradeuploadController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 删除
|
|
|
|
|
*
|
|
|
|
|