diff --git a/oms_web/oms_vue/src/api/sip/purchaseorder.js b/oms_web/oms_vue/src/api/sip/purchaseorder.js
index 7ba33668..161eabbb 100644
--- a/oms_web/oms_vue/src/api/sip/purchaseorder.js
+++ b/oms_web/oms_vue/src/api/sip/purchaseorder.js
@@ -8,6 +8,13 @@ export function listPurchaseorder(query) {
params: query
})
}
+export function listVendorPurchaseorder(query) {
+ return request({
+ url: '/sip/purchaseorder/vendor/list',
+ method: 'get',
+ params: query
+ })
+}
// 查询待审批采购单主表列表
export function listApprovePurchaseorder(query) {
diff --git a/oms_web/oms_vue/src/views/approve/order/Approve.vue b/oms_web/oms_vue/src/views/approve/order/Approve.vue
index f32ab927..c622cfe2 100644
--- a/oms_web/oms_vue/src/views/approve/order/Approve.vue
+++ b/oms_web/oms_vue/src/views/approve/order/Approve.vue
@@ -138,7 +138,7 @@ import ApproveLayout from '@/views/approve/ApproveLayout.vue';
import html2canvas from 'html2canvas';
import jsPDF from 'jspdf';
-import OrderInfoDisplay from '@/components/order/OrderInfoDisplay.vue';
+import OrderInfoDisplay from '@/views/project/order/components/OrderInfoDisplay.vue';
export default {
name: "Approve",
diff --git a/oms_web/oms_vue/src/views/inventory/execution/edit.vue b/oms_web/oms_vue/src/views/inventory/execution/edit.vue
index f8d03db9..0d901e8e 100644
--- a/oms_web/oms_vue/src/views/inventory/execution/edit.vue
+++ b/oms_web/oms_vue/src/views/inventory/execution/edit.vue
@@ -88,7 +88,7 @@ import { getDicts } from "@/api/system/dict/data";
import CheckoutDialog from './CheckoutDialog.vue';
import OuterDetailDialog from './OuterDetailDialog.vue';
import OrderDetailDrawer from "@/views/project/order/OrderDetailDrawer.vue";
-import OrderInfo from "@/components/order/OrderInfoDisplay.vue";
+import OrderInfo from "@/views/project/order/components/OrderInfoDisplay.vue";
export default {
name: "ExecutionEdit",
diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
index cd971bd9..6a7875f2 100644
--- a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
+++ b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue
@@ -167,7 +167,7 @@
import { getOrder, addOrder, updateOrder, delContractFile, uploadContractFile, getProject } from "@/api/project/order";
import ProductConfig from '@/views/project/info/ProductConfig.vue';
import SelectCommitType from "./SelectCommitType.vue";
-import OrderInfo from '@/components/order/OrderInfo.vue';
+import OrderInfo from '@/views/project/order/components/OrderInfo.vue';
import SelectProject from "@/views/project/info/SelectProject";
import SelectUser from "@/views/system/user/selectUser";
import SelectPartner from "@/views/system/partner/selectPartner";
diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue b/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue
index 2423672a..d7b31f26 100644
--- a/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/project/order/OrderDetailDrawer.vue
@@ -134,7 +134,7 @@
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java
index d37e27b8..e9d44037 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/OmsPurchaseOrderController.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.ApproveStatusEnum;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sip.domain.OmsPurchaseOrder;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
import java.util.List;
/**
@@ -49,6 +51,20 @@ public class OmsPurchaseOrderController extends BaseController
todoService.fillPurchaseOrderApproveNode(list);
return getDataTable(list);
}
+ /**
+ * 查询采购单主表列表
+ */
+ @RequiresPermissions("sip:purchaseorder:list")
+ @GetMapping("/vendor/list")
+ public TableDataInfo listVendor(OmsPurchaseOrder omsPurchaseOrder)
+ {
+
+ omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.APPROVE_COMPLETE.getCode());
+ omsPurchaseOrder.setFlowType(OmsPurchaseOrder.FlowTypeEnum.ONLINE.getCode());
+ startPage();
+ List list = omsPurchaseOrderService.selectOmsPurchaseOrderList(omsPurchaseOrder);
+ return getDataTable(list);
+ }
/**
* 查询待审批采购单主表列表
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java
index 6acf4278..9d818883 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
+import lombok.Getter;
import lombok.ToString;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -104,5 +105,39 @@ public class OmsPurchaseOrder extends BaseEntity
/** 采购单明细表信息 */
private List omsPurchaseOrderItemList;
+ @Getter
+ public enum ConfirmStatusEnum {
+ WAIT_CONFIRM("0", "待确认"),
+ CONFIRM("1", "已确认"),
+ REJECT("2", "已驳回"),
+
+ ;
+
+ private final String value;
+ private final String code;
+
+ ConfirmStatusEnum(String code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ }
+ @Getter
+ public enum FlowTypeEnum {
+ ONLINE("online", "线上"),
+ OFFLINE("offline", "线下"),
+
+
+ ;
+
+ private final String value;
+ private final String code;
+
+ FlowTypeEnum(String code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ }
}
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
index cc138f49..180aaf5c 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml
@@ -77,10 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
@@ -116,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t3.approve_user = #{entity.approveUser}
-
+
and t3.apply_time between date_format(#{entity.params.applyTimeStart}, '%Y-%m-%d 00:00:00') and
date_format(#{entity.params.applyTimeEnd}, '%Y-%m-%d 23:59:59')