码包列表查询与保存修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrPackageController.java

@@ -83,7 +83,7 @@ public class QrPackageController {
     }
 
     @ApiOperation("下载码包")
-    @GetMapping("/downloadQrPackage")
+    @PostMapping("/downloadQrPackage")
     public void downloadQrPackage(@Validated DownloadQrPackageReq downloadQrPackageReq, HttpServletResponse response) {
         qrPackageService.downloadQrPackage(downloadQrPackageReq, response);
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveQrPackageReq.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.dto.req;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -49,11 +50,9 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty(value = "啤酒厂id")
 	private Long factoryBeerId;
 
-	@NotNull(message = "箱码幅面为空")
 	@ApiModelProperty("箱码幅面id")
 	private Long boxCodeFormatId;
 
-	@NotEmpty(message = "备用码包为空")
 	@ApiModelProperty(value = "备用码包")
 	private Integer standbyRatio;
 
@@ -65,6 +64,9 @@ public class SaveQrPackageReq implements Serializable {
 	@ApiModelProperty(value = "申请原因")
 	private String reasonApply;
 
+	@Schema(name = "二维码类型 1-箱码 2-盖码 前端不用传")
+	private Integer qrType;
+
 	@ApiModelProperty(value = "批次列表")
 	private List<PackageBatchBean> packageBatchBeanList;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/mybatis/MybatisPlusConfig.java

@@ -58,8 +58,8 @@ public class MybatisPlusConfig {
                 setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
                 //操作人
                 if(TokenUtil.getUser()!=null && TokenUtil.getUser().getId()!=null){
-                    setFieldValByName("update_by", TokenUtil.getUser().getId(), metaObject);
-                    setFieldValByName("create_by", TokenUtil.getUser().getId(), metaObject);
+                    setFieldValByName("updateBy", TokenUtil.getUser().getId(), metaObject);
+                    setFieldValByName("createBy", TokenUtil.getUser().getId(), metaObject);
                 }
             }
 
@@ -68,7 +68,7 @@ public class MybatisPlusConfig {
                 setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
                 //操作人
                 if(TokenUtil.getUser()!=null && TokenUtil.getUser().getId()!=null){
-                    setFieldValByName("update_by", TokenUtil.getUser().getId(), metaObject);
+                    setFieldValByName("updateBy", TokenUtil.getUser().getId(), metaObject);
                 }
             }
         };

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -24,14 +24,7 @@ import com.abi.qms.platform.dao.vo.result.*;
 import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
-import com.abi.qms.platform.infrastructure.util.AssertUtil;
-import com.abi.qms.platform.infrastructure.util.FreeMarkerUtils;
-import com.abi.qms.platform.infrastructure.util.OssFileDownloadUtil;
-import com.abi.qms.platform.infrastructure.util.PageUtil;
-import com.abi.qms.platform.infrastructure.util.RandomCodeUtils;
-import com.abi.qms.platform.infrastructure.util.SendmailUtil;
-import com.abi.qms.platform.infrastructure.util.SmsUtil;
-import com.abi.qms.platform.infrastructure.util.UserUtil;
+import com.abi.qms.platform.infrastructure.util.*;
 import com.abi.qms.platform.service.QrPackageService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
@@ -141,6 +134,9 @@ public class QrPackageServiceImpl implements QrPackageService {
         if (!isAdd) {
             qrPackageMapper.updateById(qrPackage);
         } else {
+            //先这么写，切面不知道为啥不生效
+            qrPackage.setCreateBy(TokenUtil.getUser().getId());
+            //新增
             qrPackageMapper.insert(qrPackage);
         }
 
@@ -198,6 +194,10 @@ public class QrPackageServiceImpl implements QrPackageService {
         //3-如果是盖码，那么查询盖码得默认箱码幅面，并放入入参
         //TODO
 
+        //4-根据物料ID查询物料类型，判断码类型，保存至码包表中
+        BaseMaterial material = baseMaterialMapper.selectById(req.getMaterialId());
+        AssertUtil.isNull(material, "物料信息不存在");
+        req.setQrType(getPackageCode(material.getMaterialType()));
 
     }
 
@@ -276,13 +276,8 @@ public class QrPackageServiceImpl implements QrPackageService {
         qrPackage.setStandbyRatio(req.getStandbyRatio());
         qrPackage.setReasonApply(req.getReasonApply());
         qrPackage.setInvalid(InvalidEnum.NOT_INVALID.getCode());
-        //sta 根据物料ID查询物料类型，判断码类型，保存至码包表中
-        GetPackageCodeReq Material=new GetPackageCodeReq();
-        Material.setId(req.getMaterialId());
-        MaterialVO vo=baseMaterialMapper.getPackageCodeType(Material);
-        AssertUtil.isNull(vo, "物料信息不存在");
-        qrPackage.setQrType(getPackageCode(vo.getMaterialType()));
-        //end
+        qrPackage.setQrType(req.getQrType());
+
         return qrPackage;
     }
 
@@ -333,6 +328,14 @@ public class QrPackageServiceImpl implements QrPackageService {
             }
         }
 
+        //查询物料信息
+        BaseMaterial material = baseMaterialMapper.selectById(req.getMaterialId());
+        AssertUtil.isNull(material, "物料信息不存在");
+        if(QrTypeEnum.CARTON.is(getPackageCode(material.getMaterialType()))
+            && req.getBoxCodeFormatId()==null){
+            throw new BusinessException("箱码幅面为空");
+        }
+
         //若当前登录用户为包材厂用户，则：
         UserInfo wholeUser = userUtil.getWholeUser();
         BaseFactory factoryCover = baseFactoryMapper.selectById(req.getFactoryCoverId());

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -122,6 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND qp.apply_status = #{param.applyStatus}
             </if>
         </where>
+
+        order by qp.update_time desc
+
     </select>
 
     <select id="selectQrPackageDetailById" resultMap="QrPackageResult">