wms / wms_shanghaijiaoda · Commits

Commit ea913c0e279e95f2f99c039422f7639c89974cf4

Authored by wangyanxiong
2 parents 7a791cff d38b1b62

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

Inline Side-by-side
Showing 9 changed files with 250 additions and 958 deletions
src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java
  View file @ea913c0
... ... @@ -68,9 +68,7 @@ public class AlarmLevelController extends BaseController {
68 68 .orderByAsc(AlarmLevel::getId);
69 69  
70 70 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
71   - /**
72   - * 使用分页查询
73   - */
  71 + //使用分页查询
74 72 Page<AlarmLevel> page = new Page<>(pageNum, pageSize);
75 73 IPage<AlarmLevel> iPage = alarmLevelService.page(page, lambdaQueryWrapper);
76 74 return getMpDataTable(iPage.getRecords(),iPage.getTotal());
... ... @@ -102,8 +100,7 @@ public class AlarmLevelController extends BaseController {
102 100 lambdaQueryWrapper.eq(AlarmLevel::getLevel, alarmLevel.getLevel())
103 101 .eq(AlarmLevel::getCompanyCode, alarmLevel.getCompanyCode())
104 102 .eq(AlarmLevel::getWarehouseCode, alarmLevel.getWarehouseCode());
105   - AlarmLevel alarmLevel1 = alarmLevelService.getOne(lambdaQueryWrapper);
106   - if (alarmLevel != null){
  103 + if (alarmLevelService.getOne(lambdaQueryWrapper) != null){
107 104 return AjaxResult.error("该记录已存在");
108 105 }
109 106 alarmLevel.setCreatedBy(ShiroUtils.getLoginName());
... ...
src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
  View file @ea913c0
... ... @@ -14,8 +14,6 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
18   -import com.huaheng.pc.config.materialUnit.service.MaterialUnitService;
19 17 import com.huaheng.pc.config.material.domain.Material;
20 18 import com.huaheng.pc.config.material.service.MaterialService;
21 19 import io.swagger.annotations.Api;
... ... @@ -29,7 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
29 27  
30 28 import javax.annotation.Resource;
31 29 import java.util.List;
32   -import java.util.Map;
33 30  
34 31 @Api(tags={"物料控制类"})
35 32 @Controller
... ... @@ -41,9 +38,6 @@ public class MaterialController extends BaseController {
41 38 @Resource
42 39 private MaterialService materialService;
43 40  
44   - @Resource
45   - private MaterialUnitService materialUnitService;
46   -
47 41 @RequiresPermissions("config:material:view")
48 42 @GetMapping()
49 43 public String material() {
... ... @@ -155,8 +149,7 @@ public class MaterialController extends BaseController {
155 149 ExcelUtil<Material> util = new ExcelUtil<>(Material.class);
156 150 List<Material> materialList = util.importExcel(file.getInputStream());
157 151 String operName = ShiroUtils.getLoginName();
158   - Boolean updateSupport = false;
159   - String message = materialService.importMaterial(materialList, updateSupport, operName);
  152 + String message = materialService.importMaterial(materialList, false, operName);
160 153 return AjaxResult.success(message);
161 154 }
162 155  
... ...
src/main/java/com/huaheng/pc/config/sendMail/domain/SendMailText.java 0 → 100644
  View file @ea913c0
src/main/java/com/huaheng/pc/config/sendMail/service/MailService.java 0 → 100644
  View file @ea913c0
  1 +package com.huaheng.pc.config.sendMail.service;
  2 +
  3 +/**
  4 + * Created by Enzo Cotter on 2019/9/6.
  5 + */
  6 +
  7 +public interface MailService {
  8 +
  9 + /**
  10 + * 发送普通文本邮件
  11 + * @param to 收件人
  12 + * @param subject 主题
  13 + * @param content 内容
  14 + * @param cc 抄送
  15 + */
  16 + Boolean sendSimpleMail(String[] to, String subject, String content, String[] cc);
  17 + /**
  18 + * 发送HTML邮件
  19 + * @param to 收件人
  20 + * @param subject 主题
  21 + * @param content 内容（可以包含<html>等标签）
  22 + * @param cc 抄送
  23 + */
  24 + Boolean sendHtmlMail(String[] to, String subject, String content, String[] cc);
  25 + /**
  26 + * 发送带附件的邮件
  27 + * @param to 收件人
  28 + * @param subject 主题
  29 + * @param content 内容
  30 + * @param filePath 附件路径
  31 + * @param cc 抄送
  32 + */
  33 + Boolean sendAttachmentMail(String[] to, String subject, String content, String filePath, String[] cc);
  34 + /**
  35 + * 发送带图片的邮件
  36 + * @param to 收件人
  37 + * @param subject 主题
  38 + * @param content 文本
  39 + * @param rscPath 图片路径
  40 + * @param rscId 图片ID，用于在<img>标签中使用，从而显示图片
  41 + * @param cc 抄送邮箱
  42 + */
  43 + Boolean sendInlineResourceMail(String[] to, String subject, String content, String rscPath, String rscId, String[] cc);
  44 +}
... ...
src/main/java/com/huaheng/pc/config/sendMail/service/MailServiceImpl.java 0 → 100644
  View file @ea913c0
  1 +package com.huaheng.pc.config.sendMail.service;
  2 +
  3 +import org.slf4j.Logger;
  4 +import org.slf4j.LoggerFactory;
  5 +import org.springframework.beans.factory.annotation.Value;
  6 +import org.springframework.core.io.FileSystemResource;
  7 +import org.springframework.mail.MailException;
  8 +import org.springframework.mail.SimpleMailMessage;
  9 +import org.springframework.mail.javamail.JavaMailSender;
  10 +import org.springframework.mail.javamail.MimeMessageHelper;
  11 +import org.springframework.stereotype.Service;
  12 +
  13 +import javax.annotation.Resource;
  14 +import javax.mail.MessagingException;
  15 +import javax.mail.internet.MimeMessage;
  16 +import java.io.File;
  17 +
  18 +/**
  19 + * Created by Enzo Cotter on 2019/9/6.
  20 + */
  21 +@Service
  22 +public class MailServiceImpl implements MailService {
  23 +
  24 + private final Logger logger = LoggerFactory.getLogger(MailServiceImpl.class);
  25 +
  26 + @Value("${spring.mail.username}")
  27 + private String from;
  28 +
  29 + @Resource
  30 + private JavaMailSender mailSender;
  31 +
  32 + @Override
  33 + public Boolean sendSimpleMail(String[] to, String subject, String content, String[] cc) {
  34 + SimpleMailMessage message = new SimpleMailMessage();
  35 + message.setTo(to);//收信人
  36 + message.setSubject(subject);//主题
  37 + message.setText(content);//内容
  38 + message.setFrom(from);//发信人
  39 + if (cc.length != 0){
  40 + message.setCc(cc);
  41 + }
  42 + try {
  43 + mailSender.send(message);
  44 + return true;
  45 + } catch (MailException me){
  46 + return false;
  47 + }
  48 + }
  49 +
  50 + @Override
  51 + public Boolean sendHtmlMail(String[] to, String subject, String content, String[] cc) {
  52 + logger.info("发送HTML邮件开始：{},{},{}", to, subject, content);
  53 + MimeMessage message = mailSender.createMimeMessage();
  54 +
  55 + MimeMessageHelper helper;
  56 + try {
  57 + helper = new MimeMessageHelper(message, true);
  58 + helper.setFrom(from);
  59 + helper.setTo(to);
  60 + helper.setSubject(subject);
  61 + helper.setText(content, true);//true代表支持html
  62 + if (cc.length != 0){
  63 + helper.setCc(cc);
  64 + }
  65 + mailSender.send(message);
  66 + logger.info("发送HTML邮件成功");
  67 + return true;
  68 + } catch (MessagingException e) {
  69 + logger.error("发送HTML邮件失败：", e);
  70 + return false;
  71 + }
  72 + }
  73 +
  74 + @Override
  75 + public Boolean sendAttachmentMail(String[] to, String subject, String content, String filePath, String[] cc) {
  76 + logger.info("发送带附件邮件开始：{},{},{},{}", to, subject, content, filePath);
  77 + MimeMessage message = mailSender.createMimeMessage();
  78 +
  79 + MimeMessageHelper helper;
  80 + try {
  81 + helper = new MimeMessageHelper(message, true);
  82 + helper.setFrom(from);
  83 + helper.setTo(to);
  84 + helper.setSubject(subject);
  85 + helper.setText(content, true);
  86 + FileSystemResource file = new FileSystemResource(new File(filePath));
  87 + String fileName = file.getFilename();
  88 + helper.addAttachment(fileName, file);//添加附件，可多次调用该方法添加多个附件
  89 + mailSender.send(message);
  90 + logger.info("发送带附件邮件成功");
  91 + return true;
  92 + } catch (MessagingException e) {
  93 + logger.error("发送带附件邮件失败", e);
  94 + return false;
  95 + }
  96 + }
  97 +
  98 + @Override
  99 + public Boolean sendInlineResourceMail(String[] to, String subject, String content, String rscPath, String rscId, String[] cc) {
  100 + logger.info("发送带图片邮件开始：{},{},{},{},{},{}", to, subject, content, rscPath, rscId, cc);
  101 + MimeMessage message = mailSender.createMimeMessage();
  102 +
  103 + MimeMessageHelper helper;
  104 + try {
  105 + helper = new MimeMessageHelper(message, true);
  106 + helper.setFrom(from);
  107 + helper.setTo(to);
  108 + helper.setSubject(subject);
  109 + helper.setText(content, true);
  110 + FileSystemResource res = new FileSystemResource(new File(rscPath));
  111 + helper.addInline(rscId, res);//重复使用添加多个图片
  112 + mailSender.send(message);
  113 + logger.info("发送带图片邮件成功");
  114 + return true;
  115 + } catch (MessagingException e) {
  116 + logger.error("发送带图片邮件失败", e);
  117 + return false;
  118 + }
  119 + }
  120 +}
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
  View file @ea913c0
... ... @@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import io.swagger.annotations.ApiModel;
8 8 import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +
9 11 import java.io.Serializable;
10 12 import java.util.Date;
11 13  
12 14 @ApiModel(value="com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail")
13 15 @TableName(value = "receipt_container_detail")
  16 +@Data
14 17 public class ReceiptContainerDetail implements Serializable {
15 18 /**
16 19 * ID
... ... @@ -342,942 +345,4 @@ public class ReceiptContainerDetail implements Serializable {
342 345 private String processStamp;
343 346  
344 347 private static final long serialVersionUID = 1L;
345   -
346   - public static final String COL_RECEIPTCONTAINERID = "receiptContainerId";
347   -
348   - public static final String COL_WAREHOUSECODE = "warehouseCode";
349   -
350   - public static final String COL_RECEIPTID = "receiptId";
351   -
352   - public static final String COL_RECEIPTDETAILID = "receiptDetailId";
353   -
354   - public static final String COL_RECEIPTCODE = "receiptCode";
355   -
356   - public static final String COL_RECEIPTTYPE = "receiptType";
357   -
358   - public static final String COL_CONTAINERCODE = "containerCode";
359   -
360   - public static final String COL_CONTAINERTYPE = "containerType";
361   -
362   - public static final String COL_COMPANYCODE = "companyCode";
363   -
364   - public static final String COL_MATERIALCODE = "materialCode";
365   -
366   - public static final String COL_MATERIALNAME = "materialName";
367   -
368   - public static final String COL_MATERIALSPEC = "materialSpec";
369   -
370   - public static final String COL_MATERIALUNIT = "materialUnit";
371   -
372   - public static final String COL_QTY = "qty";
373   -
374   - public static final String COL_STATUS = "status";
375   -
376   - public static final String COL_ATTRIBUTEID = "attributeId";
377   -
378   - public static final String COL_ATTRIBUTE1 = "attribute1";
379   -
380   - public static final String COL_ATTRIBUTE2 = "attribute2";
381   -
382   - public static final String COL_ATTRIBUTE3 = "attribute3";
383   -
384   - public static final String COL_ATTRIBUTE4 = "attribute4";
385   -
386   - public static final String COL_SUPPLIERCODE = "supplierCode";
387   -
388   - public static final String COL_BATCH = "batch";
389   -
390   - public static final String COL_LOT = "lot";
391   -
392   - public static final String COL_PROJECTNO = "projectNo";
393   -
394   - public static final String COL_WEIGHT = "weight";
395   -
396   - public static final String COL_MANUFACTUREDATE = "manufactureDate";
397   -
398   - public static final String COL_EXPIRATIONDATE = "expirationDate";
399   -
400   - public static final String COL_AGINGDATE = "agingDate";
401   -
402   - public static final String COL_INVENTORYSTS = "inventorySts";
403   -
404   - public static final String COL_TASKCREATED = "taskCreated";
405   -
406   - public static final String COL_CONVERTEDQTY = "convertedQty";
407   -
408   - public static final String COL_CONVERTEDQTYUNIT = "convertedQtyUnit";
409   -
410   - public static final String COL_CREATED = "created";
411   -
412   - public static final String COL_CREATEDBY = "createdBy";
413   -
414   - public static final String COL_LASTUPDATED = "lastUpdated";
415   -
416   - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
417   -
418   - public static final String COL_VERSION = "version";
419   -
420   - public static final String COL_USERDEF1 = "userDef1";
421   -
422   - public static final String COL_USERDEF2 = "userDef2";
423   -
424   - public static final String COL_USERDEF3 = "userDef3";
425   -
426   - public static final String COL_USERDEF4 = "userDef4";
427   -
428   - public static final String COL_USERDEF5 = "userDef5";
429   -
430   - public static final String COL_USERDEF6 = "userDef6";
431   -
432   - public static final String COL_USERDEF7 = "userDef7";
433   -
434   - public static final String COL_USERDEF8 = "userDef8";
435   -
436   - public static final String COL_PROCESSSTAMP = "processStamp";
437   -
438   - /**
439   - * 获取ID
440   - *
441   - * @return id - ID
442   - */
443   - public Integer getId() {
444   - return id;
445   - }
446   -
447   - /**
448   - * 设置ID
449   - *
450   - * @param id ID
451   - */
452   - public void setId(Integer id) {
453   - this.id = id;
454   - }
455   -
456   - /**
457   - * 获取主表标识
458   - *
459   - * @return receiptContainerId - 主表标识
460   - */
461   - public Integer getReceiptContainerId() {
462   - return receiptContainerId;
463   - }
464   -
465   - /**
466   - * 设置主表标识
467   - *
468   - * @param receiptContainerId 主表标识
469   - */
470   - public void setReceiptContainerId(Integer receiptContainerId) {
471   - this.receiptContainerId = receiptContainerId;
472   - }
473   -
474   - /**
475   - * 获取仓库
476   - *
477   - * @return warehouseCode - 仓库
478   - */
479   - public String getWarehouseCode() {
480   - return warehouseCode;
481   - }
482   -
483   - /**
484   - * 设置仓库
485   - *
486   - * @param warehouseCode 仓库
487   - */
488   - public void setWarehouseCode(String warehouseCode) {
489   - this.warehouseCode = warehouseCode;
490   - }
491   -
492   - /**
493   - * 获取入库单内部号
494   - *
495   - * @return receiptId - 入库单内部号
496   - */
497   - public Integer getReceiptId() {
498   - return receiptId;
499   - }
500   -
501   - /**
502   - * 设置入库单内部号
503   - *
504   - * @param receiptId 入库单内部号
505   - */
506   - public void setReceiptId(Integer receiptId) {
507   - this.receiptId = receiptId;
508   - }
509   -
510   - /**
511   - * 获取入库单明细行号
512   - *
513   - * @return receiptDetailId - 入库单明细行号
514   - */
515   - public Integer getReceiptDetailId() {
516   - return receiptDetailId;
517   - }
518   -
519   - /**
520   - * 设置入库单明细行号
521   - *
522   - * @param receiptDetailId 入库单明细行号
523   - */
524   - public void setReceiptDetailId(Integer receiptDetailId) {
525   - this.receiptDetailId = receiptDetailId;
526   - }
527   -
528   - /**
529   - * 获取入库单编码
530   - *
531   - * @return receiptCode - 入库单编码
532   - */
533   - public String getReceiptCode() {
534   - return receiptCode;
535   - }
536   -
537   - /**
538   - * 设置入库单编码
539   - *
540   - * @param receiptCode 入库单编码
541   - */
542   - public void setReceiptCode(String receiptCode) {
543   - this.receiptCode = receiptCode;
544   - }
545   -
546   - /**
547   - * 获取入库单类型
548   - *
549   - * @return receiptType - 入库单类型
550   - */
551   - public String getReceiptType() {
552   - return receiptType;
553   - }
554   -
555   - /**
556   - * 设置入库单类型
557   - *
558   - * @param receiptType 入库单类型
559   - */
560   - public void setReceiptType(String receiptType) {
561   - this.receiptType = receiptType;
562   - }
563   -
564   - /**
565   - * 获取货箱号
566   - *
567   - * @return containerCode - 货箱号
568   - */
569   - public String getContainerCode() {
570   - return containerCode;
571   - }
572   -
573   - /**
574   - * 设置货箱号
575   - *
576   - * @param containerCode 货箱号
577   - */
578   - public void setContainerCode(String containerCode) {
579   - this.containerCode = containerCode;
580   - }
581   -
582   - /**
583   - * 获取货箱类型
584   - *
585   - * @return containerType - 货箱类型
586   - */
587   - public String getContainerType() {
588   - return containerType;
589   - }
590   -
591   - /**
592   - * 设置货箱类型
593   - *
594   - * @param containerType 货箱类型
595   - */
596   - public void setContainerType(String containerType) {
597   - this.containerType = containerType;
598   - }
599   -
600   - /**
601   - * 获取货主
602   - *
603   - * @return companyCode - 货主
604   - */
605   - public String getCompanyCode() {
606   - return companyCode;
607   - }
608   -
609   - /**
610   - * 设置货主
611   - *
612   - * @param companyCode 货主
613   - */
614   - public void setCompanyCode(String companyCode) {
615   - this.companyCode = companyCode;
616   - }
617   -
618   - /**
619   - * 获取物料
620   - *
621   - * @return materialCode - 物料
622   - */
623   - public String getMaterialCode() {
624   - return materialCode;
625   - }
626   -
627   - /**
628   - * 设置物料
629   - *
630   - * @param materialCode 物料
631   - */
632   - public void setMaterialCode(String materialCode) {
633   - this.materialCode = materialCode;
634   - }
635   -
636   - /**
637   - * 获取物料名称
638   - *
639   - * @return materialName - 物料名称
640   - */
641   - public String getMaterialName() {
642   - return materialName;
643   - }
644   -
645   - /**
646   - * 设置物料名称
647   - *
648   - * @param materialName 物料名称
649   - */
650   - public void setMaterialName(String materialName) {
651   - this.materialName = materialName;
652   - }
653   -
654   - /**
655   - * 获取物料规格
656   - *
657   - * @return materialSpec - 物料规格
658   - */
659   - public String getMaterialSpec() {
660   - return materialSpec;
661   - }
662   -
663   - /**
664   - * 设置物料规格
665   - *
666   - * @param materialSpec 物料规格
667   - */
668   - public void setMaterialSpec(String materialSpec) {
669   - this.materialSpec = materialSpec;
670   - }
671   -
672   - /**
673   - * 获取物料单位
674   - *
675   - * @return materialUnit - 物料单位
676   - */
677   - public String getMaterialUnit() {
678   - return materialUnit;
679   - }
680   -
681   - /**
682   - * 设置物料单位
683   - *
684   - * @param materialUnit 物料单位
685   - */
686   - public void setMaterialUnit(String materialUnit) {
687   - this.materialUnit = materialUnit;
688   - }
689   -
690   - /**
691   - * 获取数量
692   - *
693   - * @return qty - 数量
694   - */
695   - public Integer getQty() {
696   - return qty;
697   - }
698   -
699   - /**
700   - * 设置数量
701   - *
702   - * @param qty 数量
703   - */
704   - public void setQty(Integer qty) {
705   - this.qty = qty;
706   - }
707   -
708   - /**
709   - * 获取状态
710   - *
711   - * @return status - 状态
712   - */
713   - public Integer getStatus() {
714   - return status;
715   - }
716   -
717   - /**
718   - * 设置状态
719   - *
720   - * @param status 状态
721   - */
722   - public void setStatus(Integer status) {
723   - this.status = status;
724   - }
725   -
726   - /**
727   - * 获取属性号
728   - *
729   - * @return attributeId - 属性号
730   - */
731   - public Integer getAttributeId() {
732   - return attributeId;
733   - }
734   -
735   - /**
736   - * 设置属性号
737   - *
738   - * @param attributeId 属性号
739   - */
740   - public void setAttributeId(Integer attributeId) {
741   - this.attributeId = attributeId;
742   - }
743   -
744   - /**
745   - * 获取属性1
746   - *
747   - * @return attribute1 - 属性1
748   - */
749   - public String getAttribute1() {
750   - return attribute1;
751   - }
752   -
753   - /**
754   - * 设置属性1
755   - *
756   - * @param attribute1 属性1
757   - */
758   - public void setAttribute1(String attribute1) {
759   - this.attribute1 = attribute1;
760   - }
761   -
762   - /**
763   - * 获取属性2
764   - *
765   - * @return attribute2 - 属性2
766   - */
767   - public String getAttribute2() {
768   - return attribute2;
769   - }
770   -
771   - /**
772   - * 设置属性2
773   - *
774   - * @param attribute2 属性2
775   - */
776   - public void setAttribute2(String attribute2) {
777   - this.attribute2 = attribute2;
778   - }
779   -
780   - /**
781   - * 获取属性3
782   - *
783   - * @return attribute3 - 属性3
784   - */
785   - public String getAttribute3() {
786   - return attribute3;
787   - }
788   -
789   - /**
790   - * 设置属性3
791   - *
792   - * @param attribute3 属性3
793   - */
794   - public void setAttribute3(String attribute3) {
795   - this.attribute3 = attribute3;
796   - }
797   -
798   - /**
799   - * 获取属性4
800   - *
801   - * @return attribute4 - 属性4
802   - */
803   - public String getAttribute4() {
804   - return attribute4;
805   - }
806   -
807   - /**
808   - * 设置属性4
809   - *
810   - * @param attribute4 属性4
811   - */
812   - public void setAttribute4(String attribute4) {
813   - this.attribute4 = attribute4;
814   - }
815   -
816   - /**
817   - * 获取供应商编码
818   - *
819   - * @return supplierCode - 供应商编码
820   - */
821   - public String getSupplierCode() {
822   - return supplierCode;
823   - }
824   -
825   - /**
826   - * 设置供应商编码
827   - *
828   - * @param supplierCode 供应商编码
829   - */
830   - public void setSupplierCode(String supplierCode) {
831   - this.supplierCode = supplierCode;
832   - }
833   -
834   - /**
835   - * 获取批次
836   - *
837   - * @return batch - 批次
838   - */
839   - public String getBatch() {
840   - return batch;
841   - }
842   -
843   - /**
844   - * 设置批次
845   - *
846   - * @param batch 批次
847   - */
848   - public void setBatch(String batch) {
849   - this.batch = batch;
850   - }
851   -
852   - /**
853   - * 获取批号
854   - *
855   - * @return lot - 批号
856   - */
857   - public String getLot() {
858   - return lot;
859   - }
860   -
861   - /**
862   - * 设置批号
863   - *
864   - * @param lot 批号
865   - */
866   - public void setLot(String lot) {
867   - this.lot = lot;
868   - }
869   -
870   - /**
871   - * 获取项目号
872   - *
873   - * @return projectNo - 项目号
874   - */
875   - public String getProjectNo() {
876   - return projectNo;
877   - }
878   -
879   - /**
880   - * 设置项目号
881   - *
882   - * @param projectNo 项目号
883   - */
884   - public void setProjectNo(String projectNo) {
885   - this.projectNo = projectNo;
886   - }
887   -
888   - /**
889   - * 获取重量
890   - *
891   - * @return weight - 重量
892   - */
893   - public String getWeight() {
894   - return weight;
895   - }
896   -
897   - /**
898   - * 设置重量
899   - *
900   - * @param weight 重量
901   - */
902   - public void setWeight(String weight) {
903   - this.weight = weight;
904   - }
905   -
906   - /**
907   - * 获取生产日期
908   - *
909   - * @return manufactureDate - 生产日期
910   - */
911   - public Date getManufactureDate() {
912   - return manufactureDate;
913   - }
914   -
915   - /**
916   - * 设置生产日期
917   - *
918   - * @param manufactureDate 生产日期
919   - */
920   - public void setManufactureDate(Date manufactureDate) {
921   - this.manufactureDate = manufactureDate;
922   - }
923   -
924   - /**
925   - * 获取失效日期
926   - *
927   - * @return expirationDate - 失效日期
928   - */
929   - public Date getExpirationDate() {
930   - return expirationDate;
931   - }
932   -
933   - /**
934   - * 设置失效日期
935   - *
936   - * @param expirationDate 失效日期
937   - */
938   - public void setExpirationDate(Date expirationDate) {
939   - this.expirationDate = expirationDate;
940   - }
941   -
942   - /**
943   - * 获取入库日期
944   - *
945   - * @return agingDate - 入库日期
946   - */
947   - public Date getAgingDate() {
948   - return agingDate;
949   - }
950   -
951   - /**
952   - * 设置入库日期
953   - *
954   - * @param agingDate 入库日期
955   - */
956   - public void setAgingDate(Date agingDate) {
957   - this.agingDate = agingDate;
958   - }
959   -
960   - /**
961   - * 获取库存状态
962   - *
963   - * @return inventorySts - 库存状态
964   - */
965   - public String getInventorySts() {
966   - return inventorySts;
967   - }
968   -
969   - /**
970   - * 设置库存状态
971   - *
972   - * @param inventorySts 库存状态
973   - */
974   - public void setInventorySts(String inventorySts) {
975   - this.inventorySts = inventorySts;
976   - }
977   -
978   - /**
979   - * 获取任务已创建
980   - *
981   - * @return taskCreated - 任务已创建
982   - */
983   - public Integer getTaskCreated() {
984   - return taskCreated;
985   - }
986   -
987   - /**
988   - * 设置任务已创建
989   - *
990   - * @param taskCreated 任务已创建
991   - */
992   - public void setTaskCreated(Integer taskCreated) {
993   - this.taskCreated = taskCreated;
994   - }
995   -
996   - /**
997   - * 获取换算数量
998   - *
999   - * @return convertedQty - 换算数量
1000   - */
1001   - public Integer getConvertedQty() {
1002   - return convertedQty;
1003   - }
1004   -
1005   - /**
1006   - * 设置换算数量
1007   - *
1008   - * @param convertedQty 换算数量
1009   - */
1010   - public void setConvertedQty(Integer convertedQty) {
1011   - this.convertedQty = convertedQty;
1012   - }
1013   -
1014   - /**
1015   - * 获取换算单位
1016   - *
1017   - * @return convertedQtyUnit - 换算单位
1018   - */
1019   - public String getConvertedQtyUnit() {
1020   - return convertedQtyUnit;
1021   - }
1022   -
1023   - /**
1024   - * 设置换算单位
1025   - *
1026   - * @param convertedQtyUnit 换算单位
1027   - */
1028   - public void setConvertedQtyUnit(String convertedQtyUnit) {
1029   - this.convertedQtyUnit = convertedQtyUnit;
1030   - }
1031   -
1032   - /**
1033   - * 获取创建时间
1034   - *
1035   - * @return created - 创建时间
1036   - */
1037   - public Date getCreated() {
1038   - return created;
1039   - }
1040   -
1041   - /**
1042   - * 设置创建时间
1043   - *
1044   - * @param created 创建时间
1045   - */
1046   - public void setCreated(Date created) {
1047   - this.created = created;
1048   - }
1049   -
1050   - /**
1051   - * 获取创建用户
1052   - *
1053   - * @return createdBy - 创建用户
1054   - */
1055   - public String getCreatedBy() {
1056   - return createdBy;
1057   - }
1058   -
1059   - /**
1060   - * 设置创建用户
1061   - *
1062   - * @param createdBy 创建用户
1063   - */
1064   - public void setCreatedBy(String createdBy) {
1065   - this.createdBy = createdBy;
1066   - }
1067   -
1068   - /**
1069   - * 获取创建时间
1070   - *
1071   - * @return lastUpdated - 创建时间
1072   - */
1073   - public Date getLastUpdated() {
1074   - return lastUpdated;
1075   - }
1076   -
1077   - /**
1078   - * 设置创建时间
1079   - *
1080   - * @param lastUpdated 创建时间
1081   - */
1082   - public void setLastUpdated(Date lastUpdated) {
1083   - this.lastUpdated = lastUpdated;
1084   - }
1085   -
1086   - /**
1087   - * 获取更新用户
1088   - *
1089   - * @return lastUpdatedBy - 更新用户
1090   - */
1091   - public String getLastUpdatedBy() {
1092   - return lastUpdatedBy;
1093   - }
1094   -
1095   - /**
1096   - * 设置更新用户
1097   - *
1098   - * @param lastUpdatedBy 更新用户
1099   - */
1100   - public void setLastUpdatedBy(String lastUpdatedBy) {
1101   - this.lastUpdatedBy = lastUpdatedBy;
1102   - }
1103   -
1104   - /**
1105   - * 获取数据版本
1106   - *
1107   - * @return version - 数据版本
1108   - */
1109   - public Integer getVersion() {
1110   - return version;
1111   - }
1112   -
1113   - /**
1114   - * 设置数据版本
1115   - *
1116   - * @param version 数据版本
1117   - */
1118   - public void setVersion(Integer version) {
1119   - this.version = version;
1120   - }
1121   -
1122   - /**
1123   - * 获取自定义字段1
1124   - *
1125   - * @return userDef1 - 自定义字段1
1126   - */
1127   - public String getUserDef1() {
1128   - return userDef1;
1129   - }
1130   -
1131   - /**
1132   - * 设置自定义字段1
1133   - *
1134   - * @param userDef1 自定义字段1
1135   - */
1136   - public void setUserDef1(String userDef1) {
1137   - this.userDef1 = userDef1;
1138   - }
1139   -
1140   - /**
1141   - * 获取自定义字段2
1142   - *
1143   - * @return userDef2 - 自定义字段2
1144   - */
1145   - public String getUserDef2() {
1146   - return userDef2;
1147   - }
1148   -
1149   - /**
1150   - * 设置自定义字段2
1151   - *
1152   - * @param userDef2 自定义字段2
1153   - */
1154   - public void setUserDef2(String userDef2) {
1155   - this.userDef2 = userDef2;
1156   - }
1157   -
1158   - /**
1159   - * 获取自定义字段3
1160   - *
1161   - * @return userDef3 - 自定义字段3
1162   - */
1163   - public String getUserDef3() {
1164   - return userDef3;
1165   - }
1166   -
1167   - /**
1168   - * 设置自定义字段3
1169   - *
1170   - * @param userDef3 自定义字段3
1171   - */
1172   - public void setUserDef3(String userDef3) {
1173   - this.userDef3 = userDef3;
1174   - }
1175   -
1176   - /**
1177   - * 获取自定义字段4
1178   - *
1179   - * @return userDef4 - 自定义字段4
1180   - */
1181   - public String getUserDef4() {
1182   - return userDef4;
1183   - }
1184   -
1185   - /**
1186   - * 设置自定义字段4
1187   - *
1188   - * @param userDef4 自定义字段4
1189   - */
1190   - public void setUserDef4(String userDef4) {
1191   - this.userDef4 = userDef4;
1192   - }
1193   -
1194   - /**
1195   - * 获取自定义字段5
1196   - *
1197   - * @return userDef5 - 自定义字段5
1198   - */
1199   - public String getUserDef5() {
1200   - return userDef5;
1201   - }
1202   -
1203   - /**
1204   - * 设置自定义字段5
1205   - *
1206   - * @param userDef5 自定义字段5
1207   - */
1208   - public void setUserDef5(String userDef5) {
1209   - this.userDef5 = userDef5;
1210   - }
1211   -
1212   - /**
1213   - * 获取自定义字段6
1214   - *
1215   - * @return userDef6 - 自定义字段6
1216   - */
1217   - public String getUserDef6() {
1218   - return userDef6;
1219   - }
1220   -
1221   - /**
1222   - * 设置自定义字段6
1223   - *
1224   - * @param userDef6 自定义字段6
1225   - */
1226   - public void setUserDef6(String userDef6) {
1227   - this.userDef6 = userDef6;
1228   - }
1229   -
1230   - /**
1231   - * 获取自定义字段7
1232   - *
1233   - * @return userDef7 - 自定义字段7
1234   - */
1235   - public String getUserDef7() {
1236   - return userDef7;
1237   - }
1238   -
1239   - /**
1240   - * 设置自定义字段7
1241   - *
1242   - * @param userDef7 自定义字段7
1243   - */
1244   - public void setUserDef7(String userDef7) {
1245   - this.userDef7 = userDef7;
1246   - }
1247   -
1248   - /**
1249   - * 获取自定义字段8
1250   - *
1251   - * @return userDef8 - 自定义字段8
1252   - */
1253   - public String getUserDef8() {
1254   - return userDef8;
1255   - }
1256   -
1257   - /**
1258   - * 设置自定义字段8
1259   - *
1260   - * @param userDef8 自定义字段8
1261   - */
1262   - public void setUserDef8(String userDef8) {
1263   - this.userDef8 = userDef8;
1264   - }
1265   -
1266   - /**
1267   - * 获取处理标记
1268   - *
1269   - * @return processStamp - 处理标记
1270   - */
1271   - public String getProcessStamp() {
1272   - return processStamp;
1273   - }
1274   -
1275   - /**
1276   - * 设置处理标记
1277   - *
1278   - * @param processStamp 处理标记
1279   - */
1280   - public void setProcessStamp(String processStamp) {
1281   - this.processStamp = processStamp;
1282   - }
1283 348 }
1284 349 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java
  View file @ea913c0
... ... @@ -26,8 +26,8 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
26 26 private ReceiptHeaderService receiptHeaderService;
27 27 /**
28 28 * 根据入库单编码查询入库组盘明细
29   - * @param receiptCode
30   - * @return
  29 + * @param receiptCode 入库单编码
  30 + * @return AjaxResult
31 31 */
32 32 @Override
33 33 public AjaxResult<List<Map<String, Object>>> getReceiptInfoByBill(String receiptCode) {
... ... @@ -57,7 +57,6 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
57 57  
58 58 //查询入库头表
59 59 LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
60   - containerDetailLambda = Wrappers.lambdaQuery();
61 60 containerDetailLambda.eq(ReceiptContainerDetail::getReceiptId, receiptContainerDetail.getReceiptId());
62 61 List<ReceiptContainerDetail> containerDetailList = this.list(containerDetailLambda);
63 62 //如果入库组盘没有该入库单的组盘信息，回滚入库单状态
... ...
src/main/resources/application.yml
  View file @ea913c0
... ... @@ -72,6 +72,16 @@ spring:
72 72 restart:
73 73 # 热部署开关
74 74 enabled: true
  75 + # 邮箱配置
  76 + mail:
  77 + # 邮箱服务器
  78 + host: smtp.qq.com
  79 + # 邮箱账号
  80 + username: 752432958@qq.com
  81 + # 邮箱密码
  82 + password: owobzjvlgsxrbdfe
  83 + # 编码类型
  84 + default-encoding: utf-8
75 85  
76 86 mybatis-plus:
77 87 mapper-locations: classpath:mybatis/**/*.xml
... ... @@ -136,7 +146,4 @@ gen:
136 146 # 自动去除表前缀，默认是true
137 147 autoRemovePre: false
138 148 # 表前缀(类名不会包含表前缀)
139   - gen.tablePrefix: sys_
140   -
141   -
142   -
  149 + gen.tablePrefix: sys_
143 150 \ No newline at end of file
... ...
src/test/java/com.huaheng.test/ServiceTest.java 0 → 100644
  View file @ea913c0
  1 +package com.huaheng.test;
  2 +
  3 +import com.huaheng.pc.config.sendMail.service.MailService;
  4 +import org.junit.Test;
  5 +import org.junit.runner.RunWith;
  6 +import org.springframework.boot.test.context.SpringBootTest;
  7 +import org.springframework.test.context.junit4.SpringRunner;
  8 +
  9 +import javax.annotation.Resource;
  10 +
  11 +/**
  12 + * Created by Enzo Cotter on 2019/9/6.
  13 + */
  14 +@RunWith(SpringRunner.class)
  15 +@SpringBootTest
  16 +public class ServiceTest {
  17 +
  18 + @Resource
  19 + private MailService mailService;
  20 +
  21 + /**
  22 + * 发送简单纯文本邮件
  23 + */
  24 + @Test
  25 + public void sendSimpleMail() {
  26 + String[] to = {"752432958@qq.com"};
  27 + String[] cc = {};
  28 + mailService.sendSimpleMail(to, "发送邮件测试", "大家好，这是我用springboot进行发送邮件测试",cc);
  29 + }
  30 +
  31 + /**
  32 + * 发送HTML邮件
  33 + */
  34 + @Test
  35 + public void sendHtmlMail() {
  36 + String[] to = {"752432958@qq.com"};
  37 + String[] cc = {};
  38 + String content = "<html><body><h3><font color=\"red\">" + "大家好，这是springboot发送的HTML邮件" + "</font></h3></body></html>";
  39 + mailService.sendHtmlMail(to, "发送邮件测试", content, cc);
  40 + }
  41 +
  42 + /**
  43 + * 发送带附件的邮件
  44 + */
  45 + @Test
  46 + public void sendAttachmentMail() {
  47 + String[] to = {"752432958@qq.com"};
  48 + String[] cc = {};
  49 + String content = "<html><body><h3><font color=\"red\">" + "大家好，这是springboot发送的HTML邮件，有附件哦" + "</font></h3></body></html>";
  50 + String filePath = "your file path";
  51 + mailService.sendAttachmentMail(to, "发送邮件测试", content, filePath, cc);
  52 + }
  53 +
  54 + /**
  55 + * 发送带图片的邮件
  56 + */
  57 + @Test
  58 + public void sendInlineResourceMail() {
  59 + String[] to = {"752432958@qq.com"};
  60 + String[] cc = {};
  61 + String rscPath = "your picture path";
  62 + String rscId = "skill001";
  63 + String content = "<html><body><h3><font color=\"red\">" + "大家好，这是springboot发送的HTML邮件，有图片哦" + "</font></h3>"
  64 + + "<img src=\'cid:" + rscId + "\'></body></html>";
  65 + mailService.sendInlineResourceMail(to, "发送邮件测试", content, rscPath, rscId, cc);
  66 + }
  67 +}
... ...