Browse Source

1.修改打印标签生成的方法

training
pref_mail@163.com 2 years ago
parent
commit
79e4714f2d
  1. 175
      blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeComponent.java
  2. 181
      blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java
  3. 18
      blade-biz-common/src/main/java/org/springblade/common/utils/SystemFilePathComponent.java
  4. 2
      blade-service/logpm-aftersales/src/main/resources/application.yml
  5. 2
      blade-service/logpm-basic/src/main/resources/application.yml
  6. 8
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java
  7. 9
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
  8. 3
      blade-service/logpm-basicdata/src/main/resources/application.yml
  9. 17
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  10. 3
      blade-service/logpm-distribution/src/main/resources/application-dev.yml
  11. 4
      blade-service/logpm-distribution/src/main/resources/application.yml
  12. 4
      blade-service/logpm-distribution/src/test/com/logpm/distribution/MyTest.java
  13. 1
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml
  14. 3
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml
  15. 4
      blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
  16. 2
      blade-service/logpm-factory/src/main/resources/application.yml
  17. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java
  18. 2
      blade-service/logpm-warehouse/src/main/resources/application.yml

175
blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeComponent.java

@ -0,0 +1,175 @@
package org.springblade.common.utils;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import javax.swing.filechooser.FileSystemView;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
/**
* 二维码工具
*
* @Author:debug (SteadyJack)
* @Link: weixin-> debug0868 qq-> 1948831260
* @Date: 2020/11/16 22:38
**/
@Slf4j
@Component
public class QRCodeComponent {
@Autowired
private SystemFilePathComponent systemFilePathComponent;
//CODE_WIDTH:二维码宽度,单位像素
private final int CODE_WIDTH = 100;
//CODE_HEIGHT:二维码高度,单位像素
private final int CODE_HEIGHT = 100;
//FRONT_COLOR:二维码前景色,0x000000 表示黑色
private final int FRONT_COLOR = 0x000000;
//BACKGROUND_COLOR:二维码背景色,0xFFFFFF 表示白色
//演示用 16 进制表示,和前端页面 CSS 的取色是一样的,注意前后景颜色应该对比明显,如常见的黑白
private final int BACKGROUND_COLOR = 0xFFFFFF;
//默认生成二维码格式
private final String FileFormat = "png";
public String createCodeToFile(String content) {
try {
//getResource("/")等同于到resource文件夹下
// String imgPath = QRCodeUtil.class.getResource("").getPath()+path;
// InputStream inputStream = QRCodeUtil.class.getClassLoader().getResourceAsStream("test.properties");
// ClassLoader classLoader = QRCodeUtil.class.getClassLoader();
// URL resource = classLoader.getResource("resources/static/");
// File file = new File(resource.getFile());
return makeQrCodeImage(content, getBufferedImage(content));
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
@NotNull
private String makeQrCodeImage(String content, BufferedImage bufferedImage2) throws IOException {
String imgPath = systemFilePathComponent.filePath;
File codeImgFileSaveDir = new File(imgPath);
//1. 使用UUID重新生成文件名,防止文件名称重复造成文件覆盖
String fileName = UUID.randomUUID() + "." + FileFormat;
content = content.trim();
if (codeImgFileSaveDir == null || codeImgFileSaveDir.isFile()) {
//二维码图片存在目录为空,默认放在桌面...
codeImgFileSaveDir = FileSystemView.getFileSystemView().getHomeDirectory();
}
if (!codeImgFileSaveDir.exists()) {
//二维码图片存在目录不存在,开始创建...
codeImgFileSaveDir.mkdirs();
}
//核心代码-生成二维码
BufferedImage bufferedImage = bufferedImage2;
File codeImgFile = new File(codeImgFileSaveDir, fileName);
ImageIO.write(bufferedImage, FileFormat, codeImgFile);
fileName = imgPath + fileName;
return fileName;
}
public String createCodeToFileType(String content) {
try {
return makeQrCodeImage(content, getBufferedImageMatrix(content));
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* 生成二维码并输出到输出流, 通常用于输出到网页上进行显示输出到网页与输出到磁盘上的文件中区别在于最后一句 ImageIO.write
* write(RenderedImage im,String formatName,File output)写到文件中
* write(RenderedImage im,String formatName,OutputStream output)输出到输出流中
*
* @param content 二维码内容
*/
public void createCodeToOutputStream(String content, HttpServletResponse response) throws WriterException, IOException {
if (StringUtils.isBlank(content)) {
return;
}
content = content.trim();
//核心代码-生成二维码
BufferedImage bufferedImage = getBufferedImage(content);
//区别就是这一句,输出到输出流中,如果第三个参数是 File,则输出到文件中
ImageIO.write(bufferedImage, FileFormat, response.getOutputStream());
log.info("二维码图片生成到输出流成功...");
}
//核心代码-生成二维码
public BufferedImage getBufferedImage(String content) throws WriterException {
//com.google.zxing.EncodeHintType:编码提示类型,枚举类型
Map<EncodeHintType, Object> hints = new HashMap();
//EncodeHintType.CHARACTER_SET:设置字符编码类型
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
//EncodeHintType.ERROR_CORRECTION:设置误差校正
//ErrorCorrectionLevel:误差校正等级,L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction
//不设置时,默认为 L 等级,等级不一样,生成的图案不同,但扫描的结果是一样的
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
//EncodeHintType.MARGIN:设置二维码边距,单位像素,值越小,二维码距离四周越近
hints.put(EncodeHintType.MARGIN, 1);
MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.QR_CODE, CODE_WIDTH, CODE_HEIGHT, hints);
BufferedImage bufferedImage = new BufferedImage(CODE_WIDTH, CODE_HEIGHT, BufferedImage.TYPE_INT_BGR);
for (int x = 0; x < CODE_WIDTH; x++) {
for (int y = 0; y < CODE_HEIGHT; y++) {
bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR);
}
}
return bufferedImage;
} //核心代码-生成二维码
public BufferedImage getBufferedImageMatrix(String content) throws WriterException {
//com.google.zxing.EncodeHintType:编码提示类型,枚举类型
Map<EncodeHintType, Object> hints = new HashMap();
//EncodeHintType.CHARACTER_SET:设置字符编码类型
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
//EncodeHintType.ERROR_CORRECTION:设置误差校正
//ErrorCorrectionLevel:误差校正等级,L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction
//不设置时,默认为 L 等级,等级不一样,生成的图案不同,但扫描的结果是一样的
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
//EncodeHintType.MARGIN:设置二维码边距,单位像素,值越小,二维码距离四周越近
hints.put(EncodeHintType.MARGIN, 1);
MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.CODE_128, 100, 30, hints);
BufferedImage bufferedImage = new BufferedImage(100, 30, BufferedImage.TYPE_INT_BGR);
for (int x = 0; x < 100; x++) {
for (int y = 0; y < 30; y++) {
bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR);
}
}
return bufferedImage;
}
}

181
blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java

@ -1,181 +0,0 @@
package org.springblade.common.utils;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import javax.swing.filechooser.FileSystemView;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
/**
* 二维码工具
* @Author:debug (SteadyJack)
* @Link: weixin-> debug0868 qq-> 1948831260
* @Date: 2020/11/16 22:38
**/
public class QRCodeUtil {
private static final Logger log= LoggerFactory.getLogger(QRCodeUtil.class);
//CODE_WIDTH:二维码宽度,单位像素
private static final int CODE_WIDTH = 100;
//CODE_HEIGHT:二维码高度,单位像素
private static final int CODE_HEIGHT = 100;
//FRONT_COLOR:二维码前景色,0x000000 表示黑色
private static final int FRONT_COLOR = 0x000000;
//BACKGROUND_COLOR:二维码背景色,0xFFFFFF 表示白色
//演示用 16 进制表示,和前端页面 CSS 的取色是一样的,注意前后景颜色应该对比明显,如常见的黑白
private static final int BACKGROUND_COLOR = 0xFFFFFF;
//默认生成二维码格式
private static final String FileFormat="png";
private static final String path="qrCodeImg";
public static String createCodeToFile(String content) {
try {
//getResource("/")等同于到resource文件夹下
// String imgPath = QRCodeUtil.class.getResource("").getPath()+path;
// InputStream inputStream = QRCodeUtil.class.getClassLoader().getResourceAsStream("test.properties");
// ClassLoader classLoader = QRCodeUtil.class.getClassLoader();
// URL resource = classLoader.getResource("resources/static/");
// File file = new File(resource.getFile());
String imgPath = QRCodeUtil.class.getResource("").getPath()+path;
File codeImgFileSaveDir = new File(imgPath);
//1. 使用UUID重新生成文件名,防止文件名称重复造成文件覆盖
String fileName = UUID.randomUUID() + "." +FileFormat;
content = content.trim();
if (codeImgFileSaveDir==null || codeImgFileSaveDir.isFile()) {
//二维码图片存在目录为空,默认放在桌面...
codeImgFileSaveDir = FileSystemView.getFileSystemView().getHomeDirectory();
}
if (!codeImgFileSaveDir.exists()) {
//二维码图片存在目录不存在,开始创建...
codeImgFileSaveDir.mkdirs();
}
//核心代码-生成二维码
BufferedImage bufferedImage = getBufferedImage(content);
File codeImgFile = new File(codeImgFileSaveDir, fileName);
ImageIO.write(bufferedImage, FileFormat, codeImgFile);
fileName = imgPath.substring(1) +"/"+fileName;
return fileName;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
public static String createCodeToFileType(String content) {
try {
//getResource("/")等同于到resource文件夹下
String imgPath = QRCodeUtil.class.getResource("").getPath()+path;
File codeImgFileSaveDir = new File(imgPath);
//1. 使用UUID重新生成文件名,防止文件名称重复造成文件覆盖
String fileName = UUID.randomUUID() + "." +FileFormat;
content = content.trim();
if (codeImgFileSaveDir==null || codeImgFileSaveDir.isFile()) {
//二维码图片存在目录为空,默认放在桌面...
codeImgFileSaveDir = FileSystemView.getFileSystemView().getHomeDirectory();
}
if (!codeImgFileSaveDir.exists()) {
//二维码图片存在目录不存在,开始创建...
codeImgFileSaveDir.mkdirs();
}
//核心代码-生成二维码
BufferedImage bufferedImage = getBufferedImageMatrix(content);
File codeImgFile = new File(codeImgFileSaveDir, fileName);
ImageIO.write(bufferedImage, FileFormat, codeImgFile);
fileName = imgPath.substring(1) +"/"+fileName;
return fileName;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
/**
* 生成二维码并输出到输出流, 通常用于输出到网页上进行显示输出到网页与输出到磁盘上的文件中区别在于最后一句 ImageIO.write
* write(RenderedImage im,String formatName,File output)写到文件中
* write(RenderedImage im,String formatName,OutputStream output)输出到输出流中
* @param content 二维码内容
*/
// OutputStream outputStream,
public static void createCodeToOutputStream(String content, HttpServletResponse response) throws WriterException, IOException {
if (StringUtils.isBlank(content)) {
return;
}
content = content.trim();
//核心代码-生成二维码
BufferedImage bufferedImage = getBufferedImage(content);
//区别就是这一句,输出到输出流中,如果第三个参数是 File,则输出到文件中
ImageIO.write(bufferedImage, FileFormat,response.getOutputStream());
log.info("二维码图片生成到输出流成功...");
}
//核心代码-生成二维码
public static BufferedImage getBufferedImage(String content) throws WriterException {
//com.google.zxing.EncodeHintType:编码提示类型,枚举类型
Map<EncodeHintType, Object> hints = new HashMap();
//EncodeHintType.CHARACTER_SET:设置字符编码类型
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
//EncodeHintType.ERROR_CORRECTION:设置误差校正
//ErrorCorrectionLevel:误差校正等级,L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction
//不设置时,默认为 L 等级,等级不一样,生成的图案不同,但扫描的结果是一样的
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
//EncodeHintType.MARGIN:设置二维码边距,单位像素,值越小,二维码距离四周越近
hints.put(EncodeHintType.MARGIN, 1);
MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.QR_CODE, CODE_WIDTH, CODE_HEIGHT, hints);
BufferedImage bufferedImage = new BufferedImage(CODE_WIDTH, CODE_HEIGHT, BufferedImage.TYPE_INT_BGR);
for (int x = 0; x < CODE_WIDTH; x++) {
for (int y = 0; y < CODE_HEIGHT; y++) {
bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR);
}
}
return bufferedImage;
} //核心代码-生成二维码
public static BufferedImage getBufferedImageMatrix(String content) throws WriterException {
//com.google.zxing.EncodeHintType:编码提示类型,枚举类型
Map<EncodeHintType, Object> hints = new HashMap();
//EncodeHintType.CHARACTER_SET:设置字符编码类型
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
//EncodeHintType.ERROR_CORRECTION:设置误差校正
//ErrorCorrectionLevel:误差校正等级,L = ~7% correction、M = ~15% correction、Q = ~25% correction、H = ~30% correction
//不设置时,默认为 L 等级,等级不一样,生成的图案不同,但扫描的结果是一样的
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
//EncodeHintType.MARGIN:设置二维码边距,单位像素,值越小,二维码距离四周越近
hints.put(EncodeHintType.MARGIN, 1);
MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
BitMatrix bitMatrix = multiFormatWriter.encode(content, BarcodeFormat.CODE_128, 100, 30, hints);
BufferedImage bufferedImage = new BufferedImage(100, 30, BufferedImage.TYPE_INT_BGR);
for (int x = 0; x < 100; x++) {
for (int y = 0; y < 30; y++) {
bufferedImage.setRGB(x, y, bitMatrix.get(x, y) ? FRONT_COLOR : BACKGROUND_COLOR);
}
}
return bufferedImage;
}
}

18
blade-biz-common/src/main/java/org/springblade/common/utils/SystemFilePathComponent.java

@ -0,0 +1,18 @@
package org.springblade.common.utils;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
* 文件系统路径
*/
@Data
@Component
public class SystemFilePathComponent {
@Value("${logpm.file_system_path}")
public String filePath;
}

2
blade-service/logpm-aftersales/src/main/resources/application.yml

@ -48,3 +48,5 @@ xxl:
logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
logretentiondays: -1
port: 7018
logpm:
file_system_path: D:\logpm_temp_file\

2
blade-service/logpm-basic/src/main/resources/application.yml

@ -38,3 +38,5 @@ spring:
logpm:
file_system_path: D:\logpm_temp_file\

8
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java

@ -29,7 +29,7 @@ import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
import com.logpm.basicdata.vo.BasicdataNodeVO;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.common.utils.QRCodeComponent;
import org.springblade.common.utils.TemplateUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -71,6 +71,8 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
private IBasicPrintTemplateClient printTemplateClient;
private final QRCodeComponent qrCodeComponent;
@Override
public IPage<BasicdataGoodsAllocationVO> selectBasicdataGoodsAllocationPage(IPage<BasicdataGoodsAllocationVO> page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) {
return page.setRecords(baseMapper.selectBasicdataGoodsAllocationPage(page, BasicdataGoodsAllocation));
@ -179,7 +181,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
return false;
}
//生成二维码至本地并获取文件路径
String fileName = QRCodeUtil.createCodeToFile(qrCode);
String fileName = qrCodeComponent.createCodeToFile(qrCode);
params.put("img",fileName);
try {
//模板渲染
@ -199,7 +201,7 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
@Override
public boolean getQRCodeImg(String qrCode, HttpServletResponse response) {
try {
QRCodeUtil.createCodeToOutputStream(qrCode,response);
qrCodeComponent.createCodeToOutputStream(qrCode,response);
} catch (Exception e) {
e.printStackTrace();
log.error("二维码图片创建失败+{"+e.getMessage()+"}");

9
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@ -36,7 +36,7 @@ import com.logpm.basicdata.service.IBasicdataGoodsShelfService;
import com.logpm.basicdata.vo.BasicdataGoodsShelfVO;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.FileUtil;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.common.utils.QRCodeComponent;
import org.springblade.common.utils.TemplateUtil;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
@ -76,6 +76,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
private IBasicdataGoodsAllocationService basicdataGoodsAllocationService;
private final QRCodeComponent qrCodeComponent;
@Override
@ -207,7 +208,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
public R<?> getQrRCodeImg(String qrCode, HttpServletResponse response) {
String filename = null;
try {
filename = QRCodeUtil.createCodeToFile(qrCode);
filename = qrCodeComponent.createCodeToFile(qrCode);
} catch (Exception e) {
e.printStackTrace();
log.error("二维码图片生成失败+{"+e.getMessage()+"}");
@ -234,7 +235,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
}
Map<String,Object> map = JSONObject.parseObject(JSONObject.toJSONString(basicdataGoodsShelfEntity), Map.class);
String qrCode = (String) map.get("qrCode");
String filename = QRCodeUtil.createCodeToFile(qrCode);
String filename = qrCodeComponent.createCodeToFile(qrCode);
list.add(filename);
map.put("img",filename);
try {
@ -260,7 +261,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
log.error("参数异常:+{"+qrCode+"}");
return R.fail("服务器正忙!!!");
}
String filename = QRCodeUtil.createCodeToFile(qrCode);
String filename = qrCodeComponent.createCodeToFile(qrCode);
params.put("img","/"+filename);
ServletOutputStream os =null;
try {

3
blade-service/logpm-basicdata/src/main/resources/application.yml

@ -36,5 +36,6 @@ spring:
main:
allow-circular-references: true
logpm:
file_system_path: D:\logpm_temp_file\

17
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@ -44,9 +44,8 @@ import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
import org.springblade.common.utils.FileUtil;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.common.utils.QRCodeComponent;
import org.springblade.common.utils.TemplateUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
@ -106,6 +105,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
private final IDistributionParcelDetailsService distributionParcelDetailsService;
private final IBasicMaterialClient basicMaterialClient;
private final QRCodeComponent qrCodeComponent;
@Override
public IPage<DistributionStockArticleVO> selectDistributionStockArticlePage(IPage<DistributionStockArticleVO> page, DistributionStockArticleVO distributionStockArticle) {
@ -421,8 +422,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
log.error("参数异常:+{" + qrCode + "}");
throw new ServiceException("服务器正忙!!!");
}
String filename = QRCodeUtil.createCodeToFile(qrCode);
String filetypeName = QRCodeUtil.createCodeToFileType(qrCode);
String filename = qrCodeComponent.createCodeToFile(qrCode);
String filetypeName = qrCodeComponent.createCodeToFileType(qrCode);
params.put("img", "/" + filename);
log.info(">>>>> 文件路径{}", filename);
@ -500,10 +501,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList(null, id);
Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class);
String qrCode = (String) map.get("qrCode");
String filename = QRCodeUtil.createCodeToFile(qrCode);
String filename = qrCodeComponent.createCodeToFile(qrCode);
list.add(filename);
map.put("img", getEmpAutograph(filename));
String filetypeName = QRCodeUtil.createCodeToFileType(qrCode);
String filetypeName = qrCodeComponent.createCodeToFileType(qrCode);
map.put("imgType", getEmpAutograph(filetypeName));
list.add(filetypeName);
try {
@ -541,9 +542,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
for (String id : idArray) {
DistributionStockArticleQRCodeVO orderNoList = baseMapper.getOrderNoList(null, id);
Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(orderNoList), Map.class);
String filename = QRCodeUtil.createCodeToFile(orderNoList.getQrCode());
String filename = qrCodeComponent.createCodeToFile(orderNoList.getQrCode());
map.put("img", getEmpAutograph(filename));
String fileTypeName = QRCodeUtil.createCodeToFileType(orderNoList.getQrCode());
String fileTypeName = qrCodeComponent.createCodeToFileType(orderNoList.getQrCode());
map.put("imgType", getEmpAutograph(fileTypeName));
data.add(map);
}

3
blade-service/logpm-distribution/src/main/resources/application-dev.yml

@ -2,6 +2,9 @@
server:
port: 8600
#数据源配置
#spring:
# datasource:

4
blade-service/logpm-distribution/src/main/resources/application.yml

@ -36,5 +36,5 @@ spring:
main:
allow-circular-references: true
logpm:
file_system_path: D:\logpm_temp_file\

4
blade-service/logpm-distribution/src/test/com/logpm/distribution/MyTest.java

@ -43,9 +43,7 @@ public class MyTest {
@Test
public void te(){
Map<String, Object> params = new HashMap<>();
params.put("id","1686560469635727362");
params.put("qrCode","23072200246-1"
);
params.put("ids","1686560469635727362");
try {
OrderPackgeCodeDataVO orderPackgeCodeDataVO =distributionStockArticleService.showOrderPackgeCode(params);
System.out.println(orderPackgeCodeDataVO);

1
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml

@ -80,6 +80,7 @@
</if>
</where>
order by mfo.create_time desc
</select>
</mapper>

3
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml

@ -81,8 +81,9 @@
WHERE
pi.is_deleted = 0
<if test="mtPackageInfoVO.invoiceOrderCode!=null ">
and fom.invoice_order_code= #{mtPackageInfoVO.invoiceOrderCode}
and fom.invoice_order_code= #{mtPackageInfoVO.invoiceOrderCode}
</if>
order by pi.create_time desc
</select>
<select id="getMtPackageInfo" resultMap="mtPackageInfoDetailVO">

4
blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@ -539,7 +539,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber());
entity.setWaybillNumber(waybillNo);
entity.setWarehouseId(warehouseWaybill.getId());
if(ObjectUtil.isNotEmpty(warehouseWaybill)){
entity.setWarehouseId(warehouseWaybill.getId());
}
// 增加 进销商 名称 编码 发站仓

2
blade-service/logpm-factory/src/main/resources/application.yml

@ -47,3 +47,5 @@ xxl:
logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
logretentiondays: -1
port: 7018
logpm:
file_system_path: D:\logpm_temp_file\

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java

@ -9,6 +9,7 @@ import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@ -37,11 +38,13 @@ public class WarehouseWaybillClient implements IWarehouseWaybillClient {
}
@Override
@PostMapping(API_PREFIX + "/addEnntity")
public void addEnntity(WarehouseWaybillEntity warehouseWaybill) {
warehouseWaybillService.save(warehouseWaybill);
}
@Override
@PostMapping(API_PREFIX + "/updateEntity")
public void updateEntity(WarehouseWaybillEntity warehouseWaybill) {
warehouseWaybillService.updateById(warehouseWaybill);
}

2
blade-service/logpm-warehouse/src/main/resources/application.yml

@ -48,3 +48,5 @@ xxl:
logpath: ../data/applogs/logpm-factory-xxljob/jobhandler
logretentiondays: -1
port: 7018
logpm:
file_system_path: D:\logpm_temp_file\

Loading…
Cancel
Save