From 3af811456bf5045b79eaad7bb22b6b813c50d9d0 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 05 十一月 2024 08:40:49 +0800
Subject: [PATCH] zjh20241105
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 123 ++---------------------------------------
1 files changed, 6 insertions(+), 117 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 0665064..70336a9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -68,9 +68,9 @@
@Autowired
private LisApiMethod lisApiMethod;
@Autowired
- private IdUtils idUtils;
- @Autowired
private ISysConfigService configService;
+ @Autowired
+ private SamplingServiceApi samplingService;
/**
* 鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃
@@ -277,59 +277,8 @@
@PostMapping("/mergeCaiYang")
@ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
- @Transactional
public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
- if (null != ids && !ids.isEmpty()) {
- if(ids.size()==1)return AjaxResult.error("璇烽�夋嫨鑷冲皯涓ゆ潯椤圭洰杩涜鍚堝苟!");
- int i = tjSamplingService.panduanshifoukeyihebing(ids);
- if (i > 1) {
- return AjaxResult.error("鏍囨湰绫诲瀷涓嶄竴鑷�,涓嶅彲鍚堝苟");
- }
- int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
- if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
- if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
-// 鏌ヨ鍑洪噷闈笉鍙悎骞剁殑鍖栭獙椤圭洰
- String string = tjSamplingService.getBuKeHebingProName(ids);
- if(null !=string){
- return AjaxResult.error(string+"杩欏嚑涓」鐩笉鍙悎骞�!");
- }
- if (pdsfczhbxm == 0) {
- TjSampling tjSampling = tjSamplingService.getById(ids.get(0));
- Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(ids);
- TjSampling sampling = new TjSampling();
- String proId = map.get("proId").toString();
- String proName = map.get("proName").toString();
- BeanUtil.copyProperties(tjSampling, sampling, new String[]{"id"});
- sampling.setProId(proId);
- sampling.setProName(proName);
- sampling.setIsMerge(1);
- sampling.setJyxh(idUtils.generateLisID());
- if (tjSamplingService.save(sampling)) {
- if (tjSamplingService.updateHeBingXm(ids, sampling.getId())) {
- return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
- }
- }
- return AjaxResult.error("鎿嶄綔澶辫触!");
- } else {
- TjSampling tjSampling = tjSamplingService.getTjSamplingByHb(ids);
- List<TjSampling> samplingList = tjSamplingService.getTjSamplingListByHb(ids);
- if (null != tjSampling && null != samplingList && !samplingList.isEmpty()) {
- List<String> stringList = samplingList.stream().map(TjSampling::getId).collect(Collectors.toList());
- Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(stringList);
- String proId = map.get("proId").toString();
- String proName = map.get("proName").toString();
- tjSampling.setProId(proId);
- tjSampling.setProName(proName);
- if (tjSamplingService.updateById(tjSampling)) {
- if (tjSamplingService.updateHeBingXm(stringList, tjSampling.getParentId())) {
- return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
- }
- }
- }
- return AjaxResult.error("鎿嶄綔澶辫触!");
- }
- }
- return AjaxResult.error("璇烽�夋嫨浣犺鍚堝苟鐨勯」鐩�!!!");
+ return tjSamplingService.mergeCaiYangTran(ids);
}
@@ -412,68 +361,8 @@
@ApiOperation(value = "纭閲囨牱鎺ュ彛")
@Transactional
public AjaxResult confirmSampling(@RequestBody List<String> ids) {
- if (null == ids || ids.isEmpty()) {
- return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
- }
- List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
- if (tjSamplings.isEmpty())
- return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
- String errorMsg = "";
- for (TjSampling sampling : tjSamplings) {
- if (sampling.getJyxmdm() == null)
- errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
- sampling.setIsSignFor("0");
-// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
-// wq.eq(TjProject::getProParentId, sampling.getProId());
-// List<TjProject> projectList = projectService.list(wq);
-// List<String> collect = new ArrayList<>();
-// for (TjProject project : projectList) {
-// Long proId = project.getProId();
-// collect.add(String.valueOf(proId));
-// }
-// LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
-// wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
-// wq1.in(TjSampling::getProId, collect);
-// List<TjSampling> samplingList = tjSamplingService.list(wq1);
-// if (null != samplingList && samplingList.size() > 0) {
-// for (TjSampling tjSampling : samplingList) {
-// tjSampling.setIsSignFor("0");
-// tjSamplingService.updateById(tjSampling);
-// }
-// }
- TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
- if(null==tjOrder)return AjaxResult.error("浣撴璁板綍涓嶅瓨鍦�");
- TjCustomer tjCustomer = customerService.getById(tjOrder.getUserId());
- boolean updChild;
- String config = configService.selectConfigByKey("sfkqdyhis");
- Boolean save;
- if (null != config && config.equals("Y")) {
- save = lisApiMethod.save(sampling, tjOrder, tjCustomer);
- }else {
- save = true;
- }
- if (save) {
- if (sampling.getIsMerge() == 1) {
- LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjSampling::getParentId, sampling.getId());
- List<TjSampling> list = tjSamplingService.list(wrapper);
- for (TjSampling tjSampling : list) {
- tjSampling.setIsSignFor("0");
- }
- updChild = tjSamplingService.updateBatchById(list);
- } else {
- updChild = true;
- }
- if (!tjSamplingService.updateById(sampling) && !updChild) {
-// lisApiMethod.cancel(sampling.getJyxh(), tjOrder.getCardId(), PinyinUtil.getFirstLetter(tjCustomer.getCusName(), ""));
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
- }
- } else {
- return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
- }
- }
- if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
+ return samplingService.confirm(ids,config,mergeRequest);
}
}
--
Gitblit v1.8.0