From 1f1410ec21358c69b678af86c561f435ad83ab9d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 24 六月 2025 13:48:49 +0800
Subject: [PATCH] 2025-06-24
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 7d4d175..be1c931 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1507,8 +1507,19 @@
List<TbTransition> list = tbTransitionService.list(wrapper);
BigDecimal zongjia = new BigDecimal("0.0");
+ // his鐩存帴鍗曞紑浣撴璐瑰崟椤圭洰鎬讳环缂栫爜
String tjfhisxmbm = configService.selectConfigByKey("tjfhisxmbm");
+ // 鏄惁寮�鍚痟is鐩存帴鍗曞紑浣撴璐瑰崟椤圭洰 N浣跨敤鏄庣粏寮�鍗� 鍏朵粬閮戒负鍗曢」鐩紑鎬讳环
String lycdzjhmxj = configService.selectConfigByKey("lycdzjhmxj");
+ // 鏄惁浣跨敤his浠锋牸浼犻�掕鍒� Y寮�鍚�
+ String sfsyhisjgrule = configService.selectConfigByKey("sfsyhisjgrule");
+ // his浠锋牸浼犻�掕鍒欎繚鐣欏緱浣嶆暟 榛樿2浣�
+ String sfsyhisjgrulebaoliuweishu = configService.selectConfigByKey("sfsyhisjgrulebaoliuweishu");
+ // his浠锋牸浼犻�掕鍒� 1鍥涜垗浜斿叆 2鐩存帴鑸嶅幓
+ String sfsyhisjgrulesconfig = configService.selectConfigByKey("sfsyhisjgrulesconfig");
+ // 浼犻�掗」鐩槸鍚︿娇鐢╤is绉戝
+ String isUseHisKs = configService.selectConfigByKey("isCreateMenZhenFyUseHisKs");
+ String createMenZhenFyZJUseHisKs = configService.selectConfigByKey("createMenZhenFyZJUseHisKs");
for (TbTransition transition : list) {
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -1524,11 +1535,34 @@
int sl = 1;
BigDecimal danjia = transition.getNowPrice();
BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
+ if (StrUtil.isNotBlank(sfsyhisjgrule) && sfsyhisjgrule.equalsIgnoreCase("Y")){
+ int baoliuweishu = 2;
+ if (StrUtil.isNotBlank(sfsyhisjgrulebaoliuweishu)){
+ try {
+ baoliuweishu = Integer.parseInt(sfsyhisjgrulebaoliuweishu);
+ } catch (NumberFormatException e) {
+ log.error("his浠锋牸浼犻�掕鍒欎繚鐣欎綅鏁拌浆鎹㈠紓甯� 閰嶇疆鍊�->{}\n{}{}",sfsyhisjgrulebaoliuweishu,e,e.getMessage());
+ return AjaxResult.error();
+ }
+ }
+ if (StrUtil.isNotBlank(sfsyhisjgrulesconfig) && !sfsyhisjgrulesconfig.equalsIgnoreCase("1")){
+ // 鍏朵粬鑷畾涔夌殑瑙勫垯璁＄畻鏂规硶
+ }else {
+ // 鍥涜垗浜斿叆
+ danjia = danjia.setScale(baoliuweishu, RoundingMode.HALF_UP);
+ allPrice = danjia.multiply(new BigDecimal(sl)).setScale(baoliuweishu, RoundingMode.HALF_UP);
+ }
+ }
obj.putOpt("danJia", danjia);
obj.putOpt("jieSuanJe", allPrice);
obj.putOpt("shuliang", sl);
- obj.putOpt("zhiXingKs", dept.getDeptId());
- obj.putOpt("zhiXingKsMc", dept.getDeptName());
+ if (isUseHisKs.equalsIgnoreCase("Y")){
+ obj.putOpt("zhiXingKs", dept.getHisksid());
+ obj.putOpt("zhiXingKsMc", dept.getHisksmc());
+ }else {
+ obj.putOpt("zhiXingKs", dept.getDeptId());
+ obj.putOpt("zhiXingKsMc", dept.getDeptName());
+ }
obj.putOpt("shouFeiXmId", project.getHisXmbm());
obj.putOpt("shouFeiXmMc", project.getHisXmmc());
array.add(obj);
@@ -1545,7 +1579,12 @@
obj.putOpt("danJia", zongjia);
obj.putOpt("jieSuanJe", zongjia);
obj.putOpt("shuliang", sl);
- obj.putOpt("zhiXingKs", "100");
+ if (isUseHisKs.equalsIgnoreCase("Y")){
+ if (StrUtil.isBlank(createMenZhenFyZJUseHisKs)) return AjaxResult.error();
+ obj.putOpt("zhiXingKs", createMenZhenFyZJUseHisKs);
+ }else {
+ obj.putOpt("zhiXingKs", "100");
+ }
obj.putOpt("zhiXingKsMc","浣撴涓績");
obj.putOpt("shouFeiXmId", tjfhisxmbm);
obj.putOpt("shouFeiXmMc", "浣撴璐�");
@@ -3280,16 +3319,18 @@
return error1;
}
} else {
- tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
+
+/* tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
ycxmService.delOrderYcXmJyByTjh(tjNum);
- tjCustomer.setCardId("0");
- tjCustomerService.updateById(tjCustomer);
xdPictureService.deleteTjXdPictureBytjNum(tjNum);
- tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
+ tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());*/
+ tjOrderService.removeById(order.getOrderId());
}
String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -3758,12 +3799,13 @@
tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh);
} else {
//杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
- tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ /* tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
- tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/
+ tjOrderService.removeById(order.getOrderId());
}
}
--
Gitblit v1.8.0