发票登记插入，查询修改

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -558,6 +558,7 @@ public class IoOrderDetailBizController extends BaseController {
         ioOrderInvoiceEntity.setBatchNo(ioOrderDetailBizEntity.getBatchNo());
         ioOrderInvoiceEntity.setProductDate(ioOrderDetailBizEntity.getProductDate());
         ioOrderInvoiceEntity.setExpireDate(ioOrderDetailBizEntity.getExpireDate());
+        ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizEntity.getId());
         boolean b = ioOrderInvoiceService.insertInvoice(ioOrderInvoiceEntity);
 
         return ResultVOUtils.success("成功");

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

@@ -4,7 +4,9 @@ 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
@@ -98,10 +100,12 @@ public class IoOrderInvoiceEntity {
     private String licenseUrl;
 
 
-
     @TableField(value = "remark")
     private String remark;
 
+    @TableField(value = "bizIdFk")
+    private Integer bizIdFk;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java

@@ -28,4 +28,6 @@ public class FilterOrderDetailBizRequest extends ListPageRequest {
      * 产品名称
      */
     private String productName;
+
+    private Long bizIdFk;
 }

src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java

@@ -67,6 +67,8 @@ public class IoOrderInvoiceRequest {
 
     private String remark;
 
+    private Long bizIdFk;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

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

@@ -12,6 +12,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.service.auth.InvWarehouseService;
@@ -58,11 +59,15 @@ public class IoChangeInoutService {
     SystemParamConfigService systemParamConfigService;
     @Resource
     IoCodeTempService codeTempService;
+    @Resource
+    IoOrderInvoiceService ioOrderInvoiceService;
 
     public void changeOrder(IoOrderEntity orderEntity) {
 
         BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction());
         List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderEntity.getBillNo());
+//        List<IoOrderInvoiceEntity> invoiceEntities =ioOrderInvoiceService.deleteByInvId()
+
         if (basicBusTypePreEntity != null) {
             buildInOrder(basicBusTypePreEntity, codeEnttities, orderEntity);
         } else {

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

@@ -806,7 +806,6 @@ public class IoCheckInoutService {
             }
         }
 
-
         //校验是否是不入库存单据
         if (bussinessTypeEntity.isInStock()) {
 //        if (bussinessTypeEntity.getBusType() == ConstantStatus.BUS_TYPE_NORMAL) {

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

@@ -5,6 +5,9 @@ import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 
 public interface IoOrderInvoiceService {
 
+
+
+
     boolean deleteByInvId(Integer id);
 
     boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest);

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

@@ -19,18 +19,18 @@ public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
 
     @Override
     public boolean deleteByInvId(Integer id) {
-        return this.ioOrderInvoiceMapper.deleteById(id)>0;
+        return this.ioOrderInvoiceMapper.deleteById(id) > 0;
     }
 
     @Override
     public boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
         IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
-        BeanUtils.copyProperties(ioOrderInvoiceRequest,ioOrderInvoiceEntity);
+        BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity);
-        return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity)>0;
+        return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity) > 0;
     }
 
     @Override
     public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
-        return ioOrderInvoiceMapper.insertInvoice(ioOrderInvoiceEntity);
+        return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0;
     }
 }

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

@@ -4,8 +4,8 @@
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
         select io_order_detail_biz.*
         from io_order_detail_biz
-                 left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
+                     left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
-                 left join basic_products bp on bu.uuid = bp.uuid
+                     left join basic_products bp on bu.uuid = bp.uuid
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND orderIdFk = #{orderIdFk}
@@ -24,19 +24,19 @@
     </select>
 
     <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        SELECT
+        SELECT ic.*,
-        ic.*,
+               (select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc,
-        (select cpmctymc from basic_products where  basic_products.uuid=bu.uuid) cpmctymc,
+               (select ggxh from basic_products where basic_products.uuid = bu.uuid)     ggxh
-        (select ggxh from basic_products where  basic_products.uuid=bu.uuid) ggxh
+        FROM io_order_invoice ic
-        FROM
+                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-        io_order_invoice ic
+                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
-        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
-        LEFT JOIN io_order_detail_biz io ON bu.id = io.bindRlFk
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
             </if>
+            <if test="bizIdFk != null and bizIdFk != ''">
+                AND ic.bizIdFk = #{bizIdFk}
+            </if>
         </where>
         GROUP BY ic.id
     </select>

src/main/resources/schemas/schema_v2.1.sql

@@ -18,6 +18,9 @@ CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ',
 
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1);
+
+
 
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('auth_warehouse', 'spUse', 'tinyint', 1);