From 57b41b18aa3472be34b8b13d725db8578a14b836 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 十月 2024 16:44:13 +0800
Subject: [PATCH] zjh20241018
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java | 21 ++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java | 67 +++++++++++++++------------------
5 files changed, 64 insertions(+), 36 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
index 35235db..a979d98 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/barcode/PrintBarCodeController.java
@@ -20,9 +20,11 @@
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Base64;
import java.util.List;
import java.util.stream.Collectors;
@@ -63,46 +65,39 @@
TjCustomer one = tjCustomerService.getOne(wq1);
//鏌ュ埌椤圭洰璇︽儏 鍒ゆ柇姣忎釜椤圭洰鐨勮�楁潗 鍘婚噸 is_calculation涓篩鐨勬墦鍗� 涓旀嬁鍒拌�楁潗鍚嶇О
- LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
+// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+// List<TjOrderDetail> list = tjOrderDetailService.list(wq2);
- List<TjProConsumables> list1=new ArrayList<>();
- for (TjOrderDetail tjOrderDetail : list) {
- LambdaQueryWrapper<TjProConsumables> wq3 = new LambdaQueryWrapper<>();
- wq3.eq(TjProConsumables::getProId, tjOrderDetail.getProId());
- List<TjProConsumables> list2 = proConsumablesService.list(wq3);
- for (TjProConsumables tjProConsumables : list2) {
- list1.add(tjProConsumables);
- }
- }
- List<TjProConsumables> collect = list1.stream().distinct().collect(Collectors.toList());
- if (collect.size()==0){
+ List<TjOrderDetail> list = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+
+// List<TjProConsumables> list1=new ArrayList<>();
+// for (TjOrderDetail tjOrderDetail : list) {
+// LambdaQueryWrapper<TjProConsumables> wq3 = new LambdaQueryWrapper<>();
+// wq3.eq(TjProConsumables::getProId, tjOrderDetail.getProId());
+// List<TjProConsumables> list2 = proConsumablesService.list(wq3);
+// for (TjProConsumables tjProConsumables : list2) {
+// list1.add(tjProConsumables);
+// }
+// }
+// List<TjProConsumables> collect = list1.stream().distinct().collect(Collectors.toList());
+ if (list.isEmpty()){
return AjaxResult.success("璇ヤ綋妫�鍙锋棤鎶借椤圭洰锛�");
}
- //绾靛悜鎷兼帴鐢�
- //List<String> pac=new ArrayList<>();
- for (TjProConsumables tjProConsumables : collect) {
- TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
- if ("Y".equals(tjConsumables.getIsCalculation())){
- try {
- BufferedImage image = BarCodeUtils.getBarCodeWithWords(tjNumber+tjConsumables.getId(), tjNumber, one.getCusName(), tjConsumables.getMakings());
- ImageIO.write(image, "jpg", new File(value+"\\"+tjNumber+tjConsumables.getMakings()+".jpg"));
- //pac.add(value+tjNumber+tjConsumables.getMakings()+".jpg"); //绾靛悜鎷兼帴鐢�
- //BarCodeUtils.barCodePrint(image,250,150,250,150); //绾靛悜鎷兼帴鐢�
- } catch (IOException e) {
- e.printStackTrace();
- return AjaxResult.error();
- }
- }
+
+ try {
+ BufferedImage image = BarCodeUtils.getBarCodeWithWords(tjNumber, tjNumber, one.getCusName(),null);
+
+// ImageIO.write(image, "jpg", new File(value+"\\"+one.getCusName()+tjNumber+".jpg"));
+ ByteArrayOutputStream out=new ByteArrayOutputStream();
+ ImageIO.write(image,"jpg",out);
+ byte[] bytes = out.toByteArray();
+ String encodedToString = Base64.getEncoder().encodeToString(bytes);
+ return AjaxResult.success("鏉＄爜宸茬敓鎴愶紒鍦ㄦ枃浠跺す涓嬶細"+value,encodedToString);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return AjaxResult.error();
}
- //绾靛悜鎷兼帴
- //String[] title = pac.toArray(new String[pac.size()]);
- //joinImageListVertical(title,"jpg","E:\\mycode\\2023-2\\2.16\\"+tjNumber+".jpg");
- //璇嗗埆鏉＄爜鍐呭
- //String s = QRCodeUtils.deEncodeByPath("E:\\mycode\\2023-2\\2.16\\10001230128175552绾㈢洊瀛愭娊琛�绠�.jpg");
- //System.out.println(s);
- return AjaxResult.success("鏉＄爜宸茬敓鎴愶紒鍦ㄦ枃浠跺す涓嬶細"+value);
}
return AjaxResult.error("璇ヤ綋妫�鍙锋棤鏁堬紒");
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 98084ad..c2f9f49 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
@@ -287,6 +287,10 @@
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);
@@ -433,6 +437,7 @@
// }
// }
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");
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
index 8ee3f34..b0de598 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjSamplingMapper.java
@@ -141,4 +141,25 @@
"</script>"
})
int deleteByTjNumAndCusIdAndJxbz(@Param("tjNum") String tjNum,@Param("userId") Long userId,@Param("ids")List<String> ids);
+
+
+ @Select({"<script>","SELECT\n" +
+ " IFNULL(GROUP_CONCAT( aa.pro_name SEPARATOR ' ; ' ),NULL)\n" +
+ "FROM\n" +
+ " (\n" +
+ " SELECT\n" +
+ " a.jyxmdm,\n" +
+ " a.pro_name,\n" +
+ " b.jyxmmc,\n" +
+ " b.jybbdm,\n" +
+ " b.jyfldm \n" +
+ " FROM\n" +
+ " `tj_sampling` a\n" +
+ " LEFT JOIN ltkj_jyxmzd b ON a.jyxmdm = b.jyxmdm WHERE a.id " +
+ "IN ","<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
+ "#{id}",
+ "</foreach>"
+ +") aa " + "WHERE\n" + " aa.jyfldm NOT IN ( SELECT c.flbm FROM lis_jyflhb c);",
+ "</script>"})
+ String getBuKeHebingProName(@Param("ids")List<String> ids);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
index 2cfe467..0d0e8fd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
@@ -85,4 +85,6 @@
//淇敼鍘熸潵鍚堝苟杩囧緱椤圭洰
boolean updateHeBingXm(@Param("ids") List<String> ids);
+
+ String getBuKeHebingProName(List<String> ids);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
index 5f5c43f..64f49cc 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjSamplingServiceImpl.java
@@ -130,4 +130,9 @@
public boolean updateHeBingXm(List<String> ids) {
return tjSamplingMapper.updateHeBingXms(ids);
}
+
+ @Override
+ public String getBuKeHebingProName(List<String> ids) {
+ return tjSamplingMapper.getBuKeHebingProName(ids);
+ }
}
--
Gitblit v1.8.0