BUG修护

hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsController.java

@@ -9,6 +9,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.sale.service.documents.DocumentsService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Map;
+
 
 /**
  * <p>
@@ -57,4 +59,12 @@ public class DocumentsController {
         documentsService.delete(dto.getId());
     }
 
+    /**
+     * 生成pdf---商业发票
+     */
+    @GetMapping("/generateInvoicePdf")
+    public Map<String,Object> generateInvoicePdf(@RequestParam("id")Long id) {
+        return documentsService.generateInvoicePdf(id);
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/DocumentsService.java

@@ -49,5 +49,5 @@ public interface DocumentsService extends BaseService<Documents> {
      * 生成PDF
      * @return
      */
-    Map<String,Object> generatePdf(Long id);
+    Map<String,Object> generateInvoicePdf(Long id);
 }

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -15,6 +15,7 @@ import com.fjhx.sale.entity.documents.po.Documents;
 import com.fjhx.sale.entity.documents.po.DocumentsProduct;
 import com.fjhx.sale.entity.documents.po.DocumentsTransport;
 import com.fjhx.sale.entity.pack.po.PackDetail;
+import com.fjhx.sale.entity.pack.po.PackDetailGoods;
 import com.fjhx.sale.entity.pack.po.PackShipment;
 import com.fjhx.sale.mapper.documents.DocumentsMapper;
 import com.fjhx.sale.service.contract.ContractService;
@@ -22,6 +23,7 @@ import com.fjhx.sale.service.documents.DocumentsProductService;
 import com.fjhx.sale.service.documents.DocumentsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.service.documents.DocumentsTransportService;
+import com.fjhx.sale.service.pack.PackDetailGoodsService;
 import com.fjhx.sale.service.pack.PackDetailService;
 import com.fjhx.sale.service.pack.PackShipmentService;
 import com.obs.services.internal.ServiceException;
@@ -60,6 +62,9 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
     private PackDetailService packDetailService;
 
     @Autowired
+    private PackDetailGoodsService packDetailGoodsService;
+
+    @Autowired
     private DocumentsTransportService documentsTransportService;
 
     @Autowired
@@ -144,15 +149,15 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
     }
 
     /**
-     * 生成PDF---商业发票
+     * 生成PDF---商业发票、装箱单
      * @return
      */
     @Override
-    public Map<String, Object> generatePdf(Long id) {
+    public Map<String, Object> generateInvoicePdf(Long id) {
         Map<String,Object> map = new HashMap<>();
         //查询单证
         Documents documents = this.getById(id);
-        if(ObjectUtil.isNotEmpty(documents)){
+        if(ObjectUtil.isEmpty(documents)){
             throw new ServiceException("单证不存在");
         }
         //查询合同
@@ -177,8 +182,12 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         BigDecimal sumNetWeight = BigDecimal.ZERO;
         //总体积
         BigDecimal sumBomVolume = BigDecimal.ZERO;
+        //装箱商品明细
+        List<PackDetailGoods> packDetailGoodsList = new ArrayList<>();
         if(ObjectUtil.isNotEmpty(packShipment)){//查询装箱单
             packDetailList = packDetailService.list(Wrappers.<PackDetail>query().lambda().in(PackDetail::getId, Arrays.asList(packShipment.getPackDetailIds())));
+            List<Long> packDetailIds = packDetailList.stream().map(PackDetail::getId).collect(Collectors.toList());
+            packDetailGoodsList = packDetailGoodsService.list(Wrappers.<PackDetailGoods>query().lambda().in(PackDetailGoods::getPackDetailId,packDetailIds));
             sumRoughWeight = packDetailList.stream().map(PackDetail::getRoughWeight).reduce(BigDecimal.ZERO,BigDecimal::add);
             sumNetWeight = packDetailList.stream().map(PackDetail::getNetWeight).reduce(BigDecimal.ZERO,BigDecimal::add);
             sumBomVolume = packDetailList.stream().map(PackDetail::getBomVolume).reduce(BigDecimal.ZERO,BigDecimal::add);
@@ -193,7 +202,7 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         map.put("sumBomVolume",sumBomVolume);//总体积
         map.put("customer",customer);//买方信息
         map.put("corporation",corporation);//卖方信息
-
-        return null;
+        map.put("packDetailGoodsList",packDetailGoodsList);//装箱商品明细
+        return map;
     }
 }

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackDetailServiceImpl.java

@@ -99,7 +99,7 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
         }
         this.update(Wrappers.<PackDetail>update().lambda()
                 .set(PackDetail::getShipmentStatus,PackShipmentStatusEnum.STATUS_1.getKey())
-                .set(PackDetail::getShipmentStatus,new Date())
+                .set(PackDetail::getShipmentTime,new Date())
                 .in(PackDetail::getId,ids));
         //添加一条绑定主合同记录
         PackShipment packShipment = new PackShipment();