供应商发票确认功能提交

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

@@ -512,5 +512,12 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    @PostMapping("/udiwms/inout/order/updateOrder")
+    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
+    public BaseResponse updateOrder(@RequestBody IoOrderEntity ioOrderEntity) {
+        orderService.updateByBillNo(ioOrderEntity);
+        return ResultVOUtils.success();
+    }
+
 
 }

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

@@ -580,5 +580,32 @@ public class IoOrderDetailBizController extends BaseController {
 
     }
 
+    /**
+     * 查询单据业务详情列表
+     *
+     * @param orderDetailBizRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
+    public BaseResponse filterBizOrderList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
+        for (IoOrderDetailBizResponse ioOrderDetailBizResponse : list) {
+            String msg="";
+            IoOrderInvoiceEntity ioOrderInvoiceEntity=new IoOrderInvoiceEntity();
+            ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizResponse.getOrderIdFk());
+            List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
+            for(IoOrderInvoiceEntity obj:ioOrderInvoiceEntityList){
+                if(StrUtil.isNotEmpty(obj.getInvoiceCode())){
+                    msg+=","+obj.getInvoiceCode();
+                }
+            }
+            if(msg.length()>1){
+                msg=msg.substring(1);
+            }
+            ioOrderDetailBizResponse.setInvoiceCodes(msg);
+        }
+        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
 
 }

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

@@ -5,9 +5,13 @@ import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface IoOrderInvoiceMapper extends BaseMapperPlus<IoOrderInvoiceMapper, IoOrderInvoiceEntity, IoOrderInvoiceEntity> {
 
     boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
 
+    List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
+
 }

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

@@ -238,4 +238,7 @@ public class IoOrderEntity {
     @TableField(value = "suppleCount")
     private Integer suppleCount; //补单次数
 
+    @TableField(value = "checkStatus")
+    private Integer checkStatus; //确认状态
+
 }

src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java

@@ -161,6 +161,8 @@ public class IoOrderDetailBizResponse {
 
     private String checkFileName;
 
+    private String invoiceCodes;
+
 
 
 }

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

@@ -16,4 +16,7 @@ public interface IoOrderInvoiceService {
 
     boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
 
+    List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
+
+
 }

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

@@ -43,4 +43,9 @@ public class IoOrderInvoiceServiceImpl implements IoOrderInvoiceService {
     public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
         return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0;
     }
+
+    @Override
+    public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
+        return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceEntity);
+    }
 }

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

@@ -13,4 +13,13 @@
                 )
     </insert>
 
+    <select id="selectOrderInvoice" parameterType="com.glxp.api.entity.inout.IoOrderInvoiceEntity"  resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity"   >
+        select * from io_order_invoice
+        <where>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -137,6 +137,8 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)',
 
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1);
 
+CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1);
+
 INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
 VALUES (100, 'clean_log_task', '0 0 2 1/1 * ? ', NULL, '删除日志数据');