到货质检

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -18,7 +18,7 @@
             pi.update_user,
             pi.update_time,
             pi.victoriatourist_json,
-            IF(DATEDIFF(now(),json_unquote( victoriatourist_json -> '$.growUpDay' ))> 0,3,IF(DATEDIFF(now(), json_unquote(victoriatourist_json -> '$.newProductsDay' ))> 0, 2, 1 )) AS lifeCycle
+            IF(DATEDIFF(pi.create_time,now())> json_unquote( victoriatourist_json -> '$.growUpDay' ),3,IF( DATEDIFF(pi.create_time,now())> json_unquote( victoriatourist_json -> '$.newProductsDay' ), 2, 1 )) AS lifeCycle
         FROM
             product_info pi
             ${ew.customSqlSegment}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/quality/vo/QualityInfoVo.java

@@ -4,14 +4,61 @@ import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 质检列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-26
  */
 @Getter
 @Setter
 public class QualityInfoVo extends QualityInfo {
 
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 供应商id
+     */
+    private Long supplyId;
+
+    /**
+     * 供应商名称
+     */
+    private String supplyName;
+
+    /**
+     * 发货id
+     */
+    private Long deliverGoodsId;
+
+    /**
+     * 物料公司编号
+     */
+    private String logisticsCompanyCode;
+
+    /**
+     * 物料公司名称
+     */
+    private String logisticsCompanyName;
+
+    /**
+     * 物流公司单号
+     */
+    private String logisticsCode;
+
+    /**
+     * 采购人id
+     */
+    private String purchaseUserId;
+
+    /**
+     * 采购时间
+     */
+    private Date purchaseTime;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WmsWdlyServiceImpl.java

@@ -0,0 +1,41 @@
+package com.fjhx.victoriatourist.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fjhx.victoriatourist.entity.quality.po.QualityDetails;
+import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
+import com.fjhx.victoriatourist.service.quality.QualityDetailsService;
+import com.fjhx.victoriatourist.service.quality.QualityInfoService;
+import com.fjhx.wms.entity.quality.QualityDetailsPo;
+import com.fjhx.wms.entity.quality.QualityInfoVoPo;
+import com.fjhx.wms.service.WmsWdlyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+public class WmsWdlyServiceImpl implements WmsWdlyService {
+    @Autowired
+    QualityInfoService qualityInfoService;
+    @Autowired
+    QualityDetailsService qualityDetailsService;
+
+    /**
+     * 创建质检
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void addQualityInfo(QualityInfoVoPo queryInfoVoPo) {
+        //创建质检
+        QualityInfo qualityInfo = BeanUtil.copyProperties(queryInfoVoPo, QualityInfo.class);
+        qualityInfoService.save(qualityInfo);
+        //创建质检明细
+        List<QualityDetailsPo> qualityDetailsList = queryInfoVoPo.getQualityDetailsList();
+        List<QualityDetails> qualityDetails = BeanUtil.copyToList(qualityDetailsList, QualityDetails.class);
+        for (QualityDetails qualityDetail : qualityDetails) {
+            qualityDetail.setQualityInfoId(qualityInfo.getId());
+        }
+        qualityDetailsService.saveBatch(qualityDetails);
+    }
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -1,9 +1,13 @@
 package com.fjhx.victoriatourist.service.quality.impl;
 
+import com.fjhx.purchase.entity.arrival.vo.ArrivalDetailVo;
+import com.fjhx.supply.entity.supplier.po.SupplierInfo;
+import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
 import com.fjhx.victoriatourist.mapper.quality.QualityInfoMapper;
 import com.fjhx.victoriatourist.service.quality.QualityInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
@@ -12,6 +16,8 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,12 +29,19 @@ import cn.hutool.core.bean.BeanUtil;
  */
 @Service
 public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, QualityInfo> implements QualityInfoService {
+    @Autowired
+    SupplierInfoService supplierInfoService;
 
     @Override
     public Page<QualityInfoVo> getPage(QualityInfoSelectDto dto) {
         IWrapper<QualityInfo> wrapper = getWrapper();
         wrapper.orderByDesc("qi", QualityInfo::getId);
         Page<QualityInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<QualityInfoVo> records = page.getRecords();
+        //赋值供应商名称
+        supplierInfoService.attributeAssign(records, QualityInfoVo::getSupplyId, (item, supplier) -> {
+            item.setSupplyName(supplier.getName());
+        });
         return page;
     }
 

hx-victoriatourist/src/main/resources/mapper/quality/QualityInfoMapper.xml

@@ -5,19 +5,29 @@
         select
             qi.id,
             qi.type,
-            qi.code,
+            qi.`code`,
             qi.bussiness_id,
             qi.bussiness_code,
             qi.warehouse_id,
             qi.purchase_id,
             qi.purchase_code,
-            qi.status,
+            qi.`status`,
             qi.result_type,
             qi.create_user,
             qi.create_time,
             qi.update_user,
-            qi.update_time
+            qi.update_time,
+            p.`code` purchaseCode,
+            p.supply_id,
+            json_unquote( sw.victoriatourist_json -> '$.deliverGoodsId' ) deliverGoodsId,
+            dg.logistics_company_code,
+            dg.`code` logisticsCode,
+            p.create_user purchaseUserId,
+            p.create_time purchaseTime
         from quality_info qi
+                 JOIN bytesailing_wms.stock_wait sw ON qi.bussiness_id = sw.id
+                 JOIN bytesailing_purchase.purchase p ON sw.business_id = p.id
+                 JOIN deliver_goods dg ON dg.id = json_unquote(sw.victoriatourist_json -> '$.deliverGoodsId')
             ${ew.customSqlSegment}
     </select>
 

hx-wms/src/main/java/com/fjhx/wms/entity/quality/QualityDetailsPo.java

@@ -0,0 +1,48 @@
+package com.fjhx.wms.entity.quality;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 质检明细
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+@TableName("quality_details")
+public class QualityDetailsPo extends BasePo {
+
+    /**
+     * 质检id
+     */
+    private Long qualityInfoId;
+
+    /**
+     * 产品id
+     */
+    private Long productInfoId;
+
+    /**
+     * 需要质检数量
+     */
+    private BigDecimal totalQuantity;
+
+    /**
+     * 合格数量
+     */
+    private BigDecimal qualifiedQuantity;
+
+    /**
+     * 不合格数量
+     */
+    private BigDecimal disqualificationQuantity;
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/quality/QualityInfoPo.java

@@ -0,0 +1,66 @@
+package com.fjhx.wms.entity.quality;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 质检
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+@TableName("quality_info")
+public class QualityInfoPo extends BasePo {
+
+    /**
+     * 1采购到货质检 2京东退货质检
+     */
+    private Integer type;
+
+    /**
+     * 质检单号
+     */
+    private String code;
+
+    /**
+     * 业务id(采购待入库id)
+     */
+    private Long bussinessId;
+
+    /**
+     * 业务编码
+     */
+    private String bussinessCode;
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 采购单id
+     */
+    private Long purchaseId;
+
+    /**
+     * 采购单号
+     */
+    private String purchaseCode;
+
+    /**
+     * 状态 1未质检 2部分质检 3已质检
+     */
+    private Integer status;
+
+    /**
+     * 质检结果 1合格 0不合格
+     */
+    private Integer resultType;
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/quality/QualityInfoVoPo.java

@@ -0,0 +1,23 @@
+package com.fjhx.wms.entity.quality;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 质检列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-26
+ */
+@Getter
+@Setter
+public class QualityInfoVoPo extends QualityInfoPo {
+
+    /**
+     * 待质检明细
+     */
+    List<QualityDetailsPo> qualityDetailsList;
+
+}

hx-wms/src/main/java/com/fjhx/wms/service/WmsWdlyService.java

@@ -0,0 +1,9 @@
+package com.fjhx.wms.service;
+
+import com.fjhx.wms.entity.quality.QualityInfoVoPo;
+import com.mysql.cj.QueryInfo;
+
+public interface WmsWdlyService {
+
+    void addQualityInfo(QualityInfoVoPo queryInfoVoPo);
+}

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.wms.entity.quality.QualityDetailsPo;
+import com.fjhx.wms.entity.quality.QualityInfoVoPo;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
 import com.fjhx.wms.entity.stock.emums.JournalType;
@@ -18,6 +20,7 @@ import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.mapper.stock.StockWaitMapper;
+import com.fjhx.wms.service.WmsWdlyService;
 import com.fjhx.wms.service.stock.*;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
@@ -61,6 +64,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     StockWaitDetailsService stockWaitDetailsService;
     @Autowired
     WarehouseService warehouseService;
+    @Autowired
+    WmsWdlyService wmsWdlyService;
 
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
@@ -272,7 +277,24 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
         //如果是采购到货 创建待质检记录
         if(stockWait.getBusinessType() == StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType()){
+            //质检明细
+            QualityInfoVoPo qualityInfoVoPo = new QualityInfoVoPo();
+            qualityInfoVoPo.setType(1);//采购到货
+            qualityInfoVoPo.setBussinessId(stockWait.getId());//设置待入库id
+            qualityInfoVoPo.setBussinessCode(stockWait.getBusinessCode());//待入库单号
+            qualityInfoVoPo.setWarehouseId(stockWaitDto.getWarehouseId());//入库出库
+
+            //质检明细
+            List<QualityDetailsPo> qualityDetailsPoList = new ArrayList<>();
+            for (StockWaitDetails waitDetails : stockWaitDetailsList) {
+                QualityDetailsPo qualityDetailsPo = new QualityDetailsPo();
+                qualityDetailsPo.setProductInfoId(waitDetails.getProductId());
+                qualityDetailsPo.setTotalQuantity(waitDetails.getQuantity());
+            }
+            qualityInfoVoPo.setQualityDetailsList(qualityDetailsPoList);
 
+            //创建质检信息
+            wmsWdlyService.addQualityInfo(qualityInfoVoPo);
         }
     }