1、保存生产日期和生产批次号

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/FlowQueryRecord.java

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -62,6 +63,17 @@ public class FlowQueryRecord implements Serializable {
      */
     private String skuCode;
 
+    /**
+     * 生产批次
+     */
+    private String productionBatch;
+
+    /**
+     * 生产日期(yyyy-MM-dd)
+     */
+    private LocalDateTime productionTime;
+
+
     /**
      * 查询类型 1-箱码查询 2-托盘码查询
      */

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/FlowQueryRecordInfoVo.java

@@ -1,5 +1,6 @@
 package com.abi.qms.platform.dao.vo.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,6 +9,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * @author: zhang zhao
@@ -84,6 +86,19 @@ public class FlowQueryRecordInfoVo implements Serializable {
     private String brandName;
 
 
+    /**
+     * 生产批次
+     */
+    @ApiModelProperty(value = "生产批次")
+    private String productionBatch;
+
+    /**
+     * 生产日期
+     */
+    @ApiModelProperty(value = "生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime productionTime;
+
     /**
      * SKU信息
      */

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

@@ -69,6 +69,14 @@ public class AddFlowQueryRecordReq {
     @NotBlank
     private String skuCode;
 
+
+    @ApiModelProperty(value = "生产批次")
+    private String productionBatch;
+
+    @ApiModelProperty(value = "生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime productionTime;
+
     /**
      * 查询平台
      */

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

@@ -115,7 +115,7 @@ public class FlowQueryRecordServiceImpl implements IFlowQueryRecordService {
         //保存箱垛信息
         AddFlowQueryRecordReq.BoxStackBean boxStackInfo = addReq.getBoxStackInfo();
         FlowQueryRecordBoxStack flowQueryRecordBoxStack = new FlowQueryRecordBoxStack();
-        BeanUtil.copyProperties(boxStackInfo,flowQueryRecordBoxStack);
+        BeanUtil.copyProperties(boxStackInfo, flowQueryRecordBoxStack);
         flowQueryRecordBoxStack.setFlowQueryRecordId(flowQueryRecordId);
         queryRecordBoxStackMapper.insert(flowQueryRecordBoxStack);
 
@@ -164,19 +164,21 @@ public class FlowQueryRecordServiceImpl implements IFlowQueryRecordService {
         skuBean.setSkuName(flowQueryRecordInfoVo.getSkuName());
         skuBean.setBrandCode(flowQueryRecordInfoVo.getBrandCode());
         skuBean.setBrandName(flowQueryRecordInfoVo.getBrandName());
+        skuBean.setProductionBatch(flowQueryRecordInfoVo.getProductionBatch());
+        skuBean.setProductionTime(flowQueryRecordInfoVo.getProductionTime());
         getFlowQueryRecordInfo.setSkuInfo(skuBean);
 
         //箱垛信息
-        QueryWrapper<FlowQueryRecordBoxStack> boxStackQW=new QueryWrapper<>();
-        boxStackQW.eq("flow_query_record_id",id);
+        QueryWrapper<FlowQueryRecordBoxStack> boxStackQW = new QueryWrapper<>();
+        boxStackQW.eq("flow_query_record_id", id);
         FlowQueryRecordBoxStack flowQueryRecordBoxStack = queryRecordBoxStackMapper.selectOne(boxStackQW);
         GetFlowQueryRecordInfo.BoxStackBean boxStackBean = new GetFlowQueryRecordInfo.BoxStackBean();
-        BeanUtil.copyProperties(flowQueryRecordBoxStack,boxStackBean);
+        BeanUtil.copyProperties(flowQueryRecordBoxStack, boxStackBean);
         getFlowQueryRecordInfo.setBoxStack(boxStackBean);
 
         //流向信息
-        QueryWrapper<FlowQueryRecordFlow> flowQueryRecordFlowQW=new QueryWrapper<>();
-        flowQueryRecordFlowQW.eq("flow_query_record_id",id);
+        QueryWrapper<FlowQueryRecordFlow> flowQueryRecordFlowQW = new QueryWrapper<>();
+        flowQueryRecordFlowQW.eq("flow_query_record_id", id);
         List<FlowQueryRecordFlow> flowQueryRecordFlows = queryRecordFlowMapper.selectList(flowQueryRecordFlowQW);
         List<GetFlowQueryRecordInfo.FlowBean> flowBeans = PojoConverterUtils.copyList(flowQueryRecordFlows, GetFlowQueryRecordInfo.FlowBean.class);
         getFlowQueryRecordInfo.setFlowInfoList(flowBeans);

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

@@ -39,6 +39,7 @@ public class FlowQueryServiceImpl implements FlowQueryService {
 
     @Autowired
     private UserUtil userUtil;
+
     /**
      * 箱码查询
      * TODO 测试使用，待流向查询接口完成后，根据实际情况调整结构
@@ -48,12 +49,12 @@ public class FlowQueryServiceImpl implements FlowQueryService {
         Integer queryType = req.getQueryType();
         GetBoxCodeRes res = null;
         //箱码查询
-        if(FlowQueryTypeEnum.BOX_CODE.is(queryType)){
+        if (FlowQueryTypeEnum.BOX_CODE.is(queryType)) {
             String boxCode = req.getBoxCode();
-            res= this.getFlowInfoByBoxCode(boxCode);
+            res = this.getFlowInfoByBoxCode(boxCode);
         }
 
-        AssertUtil.isNull(res,"为查询到流向信息！");
+        AssertUtil.isNull(res, "为查询到流向信息！");
         //保存查询记录
         this.saveQueryRecord(res, req);
         return res;
@@ -62,11 +63,12 @@ public class FlowQueryServiceImpl implements FlowQueryService {
 
     /**
      * 查询流向信息
+     *
      * @param boxCode 箱码
      * @return
      */
     @Override
-    public GetBoxCodeRes getFlowInfoByBoxCode(String boxCode){
+    public GetBoxCodeRes getFlowInfoByBoxCode(String boxCode) {
         GetBoxCodeRes res = new GetBoxCodeRes();
 
         GetBoxCodeRes.SkuBean sku = new GetBoxCodeRes.SkuBean()
@@ -147,8 +149,6 @@ public class FlowQueryServiceImpl implements FlowQueryService {
     }
 
 
-
-
     /**
      * 保存查询记录
      *
@@ -165,7 +165,7 @@ public class FlowQueryServiceImpl implements FlowQueryService {
                     .collect(Collectors.toMap(GetBoxCodeRes.FlowBean::getAbnormalType, flowBean -> flowBean));
 
 
-            FlowStatusEnum flowStatus = MapUtil.isEmpty(abnormalNodeMap)  ? FlowStatusEnum.ABNORMAL : FlowStatusEnum.NORMAL;
+            FlowStatusEnum flowStatus = MapUtil.isEmpty(abnormalNodeMap) ? FlowStatusEnum.ABNORMAL : FlowStatusEnum.NORMAL;
 
             //查询类型
             Integer queryType = req.getQueryType();
@@ -180,7 +180,11 @@ public class FlowQueryServiceImpl implements FlowQueryService {
             addReq.setBrandName(res.getSku().getBrandName());
 
             //sku
-            addReq.setSkuCode(res.getSku().getSkuId());
+            GetBoxCodeRes.SkuBean sku = res.getSku();
+            addReq.setSkuCode(sku.getSkuId());
+            addReq.setProductionBatch(sku.getProductionBatch());
+            addReq.setProductionTime(sku.getProductionTime());
+
 
             //后台查询
             addReq.setQueryPlatform(ReqChannelTypeEnum.BACKSTAGE.getCode());
@@ -190,7 +194,7 @@ public class FlowQueryServiceImpl implements FlowQueryService {
 
             //abnormalNodeIn
             GetBoxCodeRes.FlowBean abnormalNodeIn = abnormalNodeMap.get(1);
-            if(Objects.nonNull(abnormalNodeIn)){
+            if (Objects.nonNull(abnormalNodeIn)) {
                 addReq.setAbnormalInNodeCode(abnormalNodeIn.getNodeId());
                 addReq.setAbnormalInNodeName(abnormalNodeIn.getNodeName());
             }
@@ -198,14 +202,14 @@ public class FlowQueryServiceImpl implements FlowQueryService {
 
             //abnormalNodeOut
             GetBoxCodeRes.FlowBean abnormalNodeOut = abnormalNodeMap.get(2);
-            if(Objects.nonNull(abnormalNodeOut)) {
+            if (Objects.nonNull(abnormalNodeOut)) {
                 addReq.setAbnormalOutNodeCode(abnormalNodeOut.getNodeId());
                 addReq.setAbnormalOutNodeName(abnormalNodeOut.getNodeName());
             }
             //箱垛信息
             GetBoxCodeRes.BoxStackBean boxStack = res.getBoxStack();
             AddFlowQueryRecordReq.BoxStackBean boxStackBean = new AddFlowQueryRecordReq.BoxStackBean();
-            BeanUtil.copyProperties(boxStack,boxStackBean);
+            BeanUtil.copyProperties(boxStack, boxStackBean);
             addReq.setBoxStackInfo(boxStackBean);
 
             //流向信息列表
@@ -214,10 +218,10 @@ public class FlowQueryServiceImpl implements FlowQueryService {
             addReq.setFlowList(flowBeans);
 
             flowQueryRecordService.addFlowQueryRecord(addReq);
-        }catch (Exception ex){
+        } catch (Exception ex) {
             //获取当前登录的用户
             UserInfo user = userUtil.getUser();
-            log.error("查询流向信息记录报错失败！,查询人：【{}】,查询结果:【{}】,异常:{}",user.getUserName(),JSONUtil.toJsonStr(res),ex.getMessage());
+            log.error("查询流向信息记录报错失败！,查询人：【{}】,查询结果:【{}】,异常:{}", user.getUserName(), JSONUtil.toJsonStr(res), ex.getMessage());
         }
     }
 

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

@@ -139,6 +139,8 @@
         <result property="brandName" column="brand_name"/>
         <result property="skuName" column="sku_name"/>
         <result property="skuCode" column="sku_code"/>
+        <result property="productionBatch" column="production_batch"/>
+        <result property="productionTime" column="production_time"/>
         <result property="queryUserName" column="user_name"/>
         <result property="queryTime" column="create_time"/>
     </resultMap>
@@ -154,6 +156,8 @@
         `box_code`,
         `tray_code`,
         `sku_code`,
+        `production_batch`,
+        `production_time`,
         `brand_code`,
         `brand_name`,
         `query_platform`,