添加订单发票相关

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

@@ -123,19 +123,19 @@ public class BasicOrderPrintController {
                     bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
                     bizData.put("remark1", obj.getRemark1() == null ? ' ' : obj.getRemark1());
                     bizData.put("remark2", obj.getRemark2() == null ? ' ' : obj.getRemark2());
-//                bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
+                    bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
                     bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName());
                     bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec());
                     bizData.put("count", obj.getCount());
                     bizData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname());
                     bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice());
                     bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo());
-//                bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo());
+                    bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo());
                     bizData.put("productDate", obj.getProductDate());
                     bizData.put("expireDate", obj.getExpireDate());
                     bizData.put("manufactor", obj.getManufacturer());
-//                bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh());
+                    bizData.put("zczbhhzbapzbh", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh());
-//                bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
+                    bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
                     list.add(bizData);
                     i++;
                 }
@@ -160,6 +160,9 @@ public class BasicOrderPrintController {
                             break;
                         }
                     }
+                    //查询产品表
+                    UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk());
+
                     //组装数据
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
@@ -169,7 +172,7 @@ public class BasicOrderPrintController {
                     bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
                     bizData.put("remark1", ioOrderDetailBizEntity.getRemark1() == null ? ' ' : ioOrderDetailBizEntity.getRemark1());
                     bizData.put("remark2", ioOrderDetailBizEntity.getRemark2() == null ? ' ' : ioOrderDetailBizEntity.getRemark2());
-//                bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
+                    bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
                     bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName());
                     bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec());
                     bizData.put("count", ioOrderDetailBizEntity.getCount());
@@ -180,8 +183,8 @@ public class BasicOrderPrintController {
                     bizData.put("productDate", ioOrderDetailBizEntity.getProductDate());
                     bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate());
                     bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
-//                bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh());
+                    bizData.put("zczbhhzbapzbh", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh());
-//                bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
+                    bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
                     list.add(bizData);
                     i++;
                 }

src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java

@@ -305,47 +305,25 @@ public class PurDeliveryController {
     public BaseResponse addPlanDetailAndOrder(@RequestBody PurDeliveryRequest purDeliveryRequest) {
 
 
-//        List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getBillNo());
+        List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purDeliveryRequest.getPurOrderId() + "");
-//
+        List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purOrderDetailEntities.stream()
-//        List<PurDeliveryDetailEntity> purDeliveryDetailEntities = purOrderDetailEntities.stream()
+                .map(e -> {
-//                .map(e -> {
+                    PurDeliveryDetailEntity d = new PurDeliveryDetailEntity();
-//                    PurDeliveryDetailEntity d = new PurDeliveryDetailEntity();
+                    BeanUtils.copyProperties(e, d);
-//                    BeanUtils.copyProperties(e, d);
+                    return d;
-//                    return d;
+                })
-//                })
+                .collect(Collectors.toList());
-//                .collect(Collectors.toList());
+        for (PurDeliveryDetailEntity obj : purDeliveryDetailEntities) {
-//
+            obj.setOrderIdFk(purDeliveryRequest.getId() + "");
-//        for (PurDeliveryDetailEntity obj : purDeliveryDetailEntities) {
+        }
-//            obj.setOrderIdFk(purOrderEntity.getId() + "");
+        boolean falg = purDeliveryDetailService.insertPurDeliveryDetailEntity(purDeliveryDetailEntities);
-//        }
+        if (falg) {
-//        //获取详情表信息
+            //查询申购单
-//        List<PurOrderDetailEntity> exitsDetails = purDeliveryDetailService.findByOrderId();
+            return ResultVOUtils.success("添加成功");
-//
+
-//
+        } else {
-//        List<Long> ids = new ArrayList<>();
+            return ResultVOUtils.success("添加失败");
-//        for (PurOrderDetailEntity obj : purOrderDetailEntities) {
+        }
-//            for (PurOrderDetailEntity obj1 : purOrderDetailEntityList) {
-//                if (obj.getProductId().equals(obj1.getProductId())) {
-//                    //获取存在在详情表和申购单里面一样的产品
-//                    ids.add(obj.getId().longValue());
-//                    break;
-//                }
-//            }
-//        }
-//        //删除存在的产品
-//        if (ids.size() > 0) {
-//            purOrderDetailService.deleteByIds(ids);
-//        }
-//
-//        boolean falg = purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
-//        if (falg) {
-//            //查询申购单
-//            return ResultVOUtils.success("添加成功");
-//
-//        } else {
-//            return ResultVOUtils.success("添加失败");
-//        }
-        return ResultVOUtils.success("添加失败");
     }
 
 }

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

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoOrderInvoiceMapper extends BaseMapper<IoOrderInvoiceEntity> {
+}

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -0,0 +1,102 @@
+package com.glxp.api.entity.inout;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "io_order_invoice")
+public class IoOrderInvoiceEntity {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 订单号外键
+     */
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+    /**
+     * 机器编码
+     */
+    @TableField(value = "machineNo")
+    private String machineNo;
+
+    /**
+     * 发票代码
+     */
+    @TableField(value = "invoiceCode")
+    private String invoiceCode;
+
+    /**
+     * 发票编码
+     */
+    @TableField(value = "invoiceEncode")
+    private String invoiceEncode;
+
+    /**
+     * 开票日期
+     */
+    @TableField(value = "invoiceDate")
+    private String invoiceDate;
+
+    /**
+     * 发票价格
+     */
+    @TableField(value = "price")
+    private String price;
+
+    /**
+     * 更新是日期
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "`createUser`")
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    private String updateUser;
+
+    @TableField(value = "remark")
+    private String remark;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_ORDERIDFK = "orderIdFk";
+
+    public static final String COL_MACHINENO = "machineNo";
+
+    public static final String COL_INVOICECODE = "invoiceCode";
+
+    public static final String COL_INVOICEENCODE = "invoiceEncode";
+
+    public static final String COL_INVOICEDATE = "invoiceDate";
+
+    public static final String COL_PRICE = "price";
+
+    public static final String COL_UPDATETIME = "updateTime";
+
+    public static final String COL_CREATEUSER = "createUser";
+
+    public static final String COL_CREATETIME = "createTime";
+
+    public static final String COL_UPDATEUSER = "updateUser";
+
+    public static final String COL_REMARK = "remark";
+}

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

@@ -0,0 +1,4 @@
+package com.glxp.api.service.inout;
+
+public interface IoOrderInvoiceService {
+}

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

@@ -0,0 +1,10 @@
+package com.glxp.api.service.inout.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.glxp.api.service.inout.IoOrderInvoiceService;
+
+@Service
+public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
+
+}

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.inout.IoOrderInvoiceMapper">
+</mapper>