发票打印

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -9,27 +9,13 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
-import com.glxp.api.entity.inv.InnerOrderEntity;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
-import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
+import com.glxp.api.entity.system.SystemPDFTemplateEntity;
-import com.glxp.api.entity.purchase.SupCertEntity;
-import com.glxp.api.entity.purchase.SupManufacturerEntity;
-import com.glxp.api.entity.purchase.SupProductEntity;
-import com.glxp.api.entity.system.*;
 import com.glxp.api.req.basic.FilterOrderPrintRequest;
-import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
-import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
+import com.glxp.api.res.inout.IoOrderInvoiceResponse;
-import com.glxp.api.req.inv.FilterinnerOrderprintRequest;
-import com.glxp.api.req.inv.InnerOrderQRCodeTextPDFTemplateRequest;
-import com.glxp.api.req.inv.PdfPrintCountEntity;
-import com.glxp.api.req.purchase.FilterSupManufacturerRequest;
-import com.glxp.api.req.purchase.purPlanPrintRequest;
-import com.glxp.api.req.system.FilterPdfTemplateRequest;
-import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
-import com.glxp.api.res.inv.InnerOrderPrintResponse;
-import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.inout.IoCodeService;
@@ -41,7 +27,6 @@ import com.glxp.api.service.system.SystemPDFTemplateRelevanceService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -50,12 +35,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @RestController
@@ -81,7 +62,6 @@ public class BasicOrderPrintController {
     private String filePath;
     @Resource
     SystemPDFTemplateRelevanceCodeService systemPDFTemplateRelevanceCodeService;
-
     //校验模板是否正确
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/pdf/template/inspection/order/file")
@@ -130,6 +110,7 @@ public class BasicOrderPrintController {
                 for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) {
                     //查询产品表
                     UdiProductEntity udiProductEntity = udiProductService.findByUuid(obj.getUuidFk());
+                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(obj.getOrderIdFk());
                     //组装数据
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
@@ -152,6 +133,18 @@ public class BasicOrderPrintController {
                     bizData.put("manufactor", obj.getManufacturer());
                     bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
+                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
+                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
+                        String encode="";
+                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
+                            encode+=respons.getInvoiceEncode()+",";
+                        }
+                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
+                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
+
+                    }
                     list.add(bizData);
                     i++;
                 }
@@ -178,7 +171,7 @@ public class BasicOrderPrintController {
                     }
                     //查询产品表
                     UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk());
-
+                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
                     //组装数据
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
@@ -201,6 +194,17 @@ public class BasicOrderPrintController {
                     bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
+                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
+                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
+                        String encode="";
+                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
+                            encode+=respons.getInvoiceEncode()+",";
+                        }
+                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
+                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
+                    }
                     list.add(bizData);
                     i++;
                 }

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -28,6 +28,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
 
+    List<IoOrderInvoiceResponse> selectByorderIdFk(String  orderIdFk);
+
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
 

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -46,6 +46,8 @@ public interface IoOrderDetailBizService {
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
 
+    List<IoOrderInvoiceResponse> selectByorderIdFk(String  orderIdFk);
+
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
-import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
@@ -193,6 +192,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest);
     }
 
+    @Override
+    public List<IoOrderInvoiceResponse> selectByorderIdFk(String orderIdFk) {
+        return ioOrderDetailBizDao.selectByorderIdFk(orderIdFk);
+    }
+
     @Override
     public IoOrderInvoiceResponse selectByinvoiceId(Long id) {
         return ioOrderDetailBizDao.selectByinvoiceId(id);

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -30,6 +30,13 @@
         where id = #{id}
     </select>
 
+    <select id="selectByorderIdFk" parameterType="java.lang.String"
+            resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        select *
+        from io_order_invoice
+        where orderIdFk = #{orderIdFk}
+    </select>
+
 
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
         select io_order_detail_code.*,