BUG修护

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -117,7 +117,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     @Override
     @DSTransactional
     public void addBatch(List<WorkOrder> workOrder) {
-        if(CollectionUtils.isNotEmpty(workOrder)){
+        if(CollectionUtils.isEmpty(workOrder)){
             throw new ServiceException("提交不能为空");
         }
         List<ContractProduct> upContractProduct = new ArrayList<>();

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

@@ -7,6 +7,8 @@ import com.fjhx.sale.entity.documents.vo.DocumentsVo;
 import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
 import com.fjhx.sale.entity.documents.dto.DocumentsDto;
 
+import java.util.Map;
+
 
 /**
  * <p>
@@ -43,4 +45,9 @@ public interface DocumentsService extends BaseService<Documents> {
      */
     void delete(Long id);
 
+    /**
+     * 生成PDF
+     * @return
+     */
+    Map<String,Object> generatePdf(Long id);
 }

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

@@ -7,14 +7,17 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
+import com.fjhx.sale.entity.contract.po.Contract;
 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.mapper.documents.DocumentsMapper;
+import com.fjhx.sale.service.contract.ContractService;
 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.obs.services.internal.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,6 +27,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.documents.dto.DocumentsDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,10 +47,14 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
     private DocumentsProductService documentsProductService;
 
     @Autowired
+    private ContractService contractService;
+
+    @Autowired
     private DocumentsTransportService documentsTransportService;
 
     @Autowired
     private CorporationService corporationService;
+
     /**
      * 单证表分页
      */
@@ -117,4 +125,27 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
         documentsTransportService.remove(Wrappers.<DocumentsTransport>lambdaQuery().eq(DocumentsTransport::getDocumentsId,id));
     }
 
+    /**
+     * 生成PDF---商业发票
+     * @return
+     */
+    @Override
+    public Map<String, Object> generatePdf(Long id) {
+        Map<String,Object> map = new HashMap<>();
+        //查询单证
+        Documents documents = this.getById(id);
+        if(ObjectUtil.isNotEmpty(documents)){
+            throw new ServiceException("单证不存在");
+        }
+        //查询单证货物
+        List<DocumentsProduct> documentsProducts = documentsProductService.list(Wrappers.<DocumentsProduct>query().lambda().eq(DocumentsProduct::getDocumentsId,documents.getId()));
+        //查询合同
+        Contract contract = contractService.getById(documents.getContractId());
+        map.put("documents",documents);//单证信息
+        map.put("documents",documentsProducts);//单证信息货物
+
+
+
+        return null;
+    }
 }

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

@@ -45,9 +45,5 @@ public interface PackService extends BaseService<Pack> {
      */
     void delete(Long id);
 
-    /**
-     * 生成PDF
-     * @return
-     */
-    Map<String,Object> generatePdf(Long id);
+
 }

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

@@ -135,15 +135,4 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
         this.removeById(id);
     }
 
-    /**
-     * 生成PDF
-     * @return
-     */
-    @Override
-    public Map<String, Object> generatePdf(Long id) {
-        //查询装箱单
-        getById(id);
-        return null;
-    }
-
 }