diff --git a/supervise-customer-ui/src/router/modules/codemenu.js b/supervise-customer-ui/src/router/modules/codemenu.js index c715b7ae..a1ff98a1 100644 --- a/supervise-customer-ui/src/router/modules/codemenu.js +++ b/supervise-customer-ui/src/router/modules/codemenu.js @@ -317,6 +317,14 @@ const codemenu = [{ title: '上传采购订单', noCache: true } + },{ + path: '/purchaserequisition/listofcheck', + component: () => import('@/views/purchaserequisition/listofcheck/index.vue'), + name: 'purchaserequisitionlistofcheck', + meta: { + title: '采购申请', + noCache: true + } }] }] export default codemenu diff --git a/supervise-customer-ui/src/views/purchaserequisition/listofcheck/index.vue b/supervise-customer-ui/src/views/purchaserequisition/listofcheck/index.vue new file mode 100644 index 00000000..223ecc31 --- /dev/null +++ b/supervise-customer-ui/src/views/purchaserequisition/listofcheck/index.vue @@ -0,0 +1,488 @@ + + + + + + {{ viewTitle }} + + + 下载Excel示例表样 + + + 上传采购订单excel文件 + + + 关闭 + + + + + + + + + + + + 采购订单信息 + + + 订单编号 + + + {{ formobj.code }} + + + 填单人 + + + {{ formobj.buyerName }} + + + 填单时间 + + + {{ formobj.purchaseDate }} + + + + + 供货单位 + + + {{ formobj.supplierName }} + + + 仓位 + + + {{ formobj.warehousePosition }} + + + 到货日期 + + + {{ formobj.arrivalDate }} + + + + + 采购员 + + + {{ formobj.buyerName }} + + + 入库单位 + + + {{ formobj.purchasingDeptName }} + + + 单据到效期 + + + {{ formobj.expiryDate }} + + + + + 要货单位 + + + {{ formobj.purchasingDeptName }} + + + 入库仓位 + + + {{ formobj.warehousePosition }} + + + 完成状态 + + + {{ formobj.completionStatus }} + + + + + 采购商品明细 + + 合计数量:{{ totalQuantity }} + 合计金额:{{ amountInTotal }} + + + + + + + + + + + + + + + + + + + + + 供应商信息检测 + 重新检测 + + + {{ supplierCheckMsg }} + + + + + + + + + + + + + + + + 商品信息检测 + 重新检测 + + + {{ proCheckMsg }} + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java index a646c4e7..bc566d6b 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java @@ -16,7 +16,7 @@ public class PurchaseRequisitionCheckVo { private String supplierName; private String supplierCodeUnified; - private int resState = 0; // 0=正常;1=无供应商信息;2=供应商编码不符;3=有在途;4=供应商索引编码重复;5=没有对应订单;6=供应商没审核 + private int resState = 0; // 0=正常;1=无供应商信息;2=索引与供应商关联错误;3=有在途;4=供应商索引编码重复;5=没有对应订单;6=供应商没审核 private String msg; public String getPrSid() { diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java index 84092e6a..4e361068 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java @@ -96,4 +96,12 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { purchaseRequisitionService.updatePurchaseStateSucess(sid); return rb.success(); } + + @ApiOperation("上传后待提交给银行的订单列表") + @GetMapping("/listOfCheck") + public ResultBean> listOfCheck() { + ResultBean rb = ResultBean.fireFail(); + List pv = purchaseRequisitionService.listOfCheck(); + return rb.success().setData(pv); + } } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java index d34b40b4..fa405327 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java @@ -298,4 +298,15 @@ public class PurchaseRequisitionService extends MybatisBaseService listOfCheck() { + List list = listByState("1"); + return list; + } + + private List listByState(String state) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("state", state); + return baseMapper.selectList(qw); + } } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java index 1712fb51..56f91a94 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java @@ -311,7 +311,6 @@ public class SupplierBankInfoService extends MybatisBaseService