修改了取消接单可能删除所有数据不显示的bug
This commit is contained in:
Liuqi
parent
a255ca747b
commit
bcdfaf4461
|
|
@ -0,0 +1,68 @@
|
|||
-- phpMyAdmin SQL Dump
|
||||
-- version 5.2.0
|
||||
-- https://www.phpmyadmin.net/
|
||||
--
|
||||
-- 主机： localhost
|
||||
-- 生成日期： 2023-08-16 17:41:52
|
||||
-- 服务器版本： 5.7.40-log
|
||||
-- PHP 版本： 7.4.33
|
||||
|
||||
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
|
||||
START TRANSACTION;
|
||||
SET time_zone = "+00:00";
|
||||
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
||||
/*!40101 SET NAMES utf8mb4 */;
|
||||
|
||||
--
|
||||
-- 数据库： `jeecg-boot`
|
||||
--
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- 表的结构 `purchase_order_confirmation`
|
||||
--
|
||||
|
||||
CREATE TABLE `purchase_order_confirmation` (
|
||||
`id` varchar(36) NOT NULL,
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
|
||||
`association_number` varchar(32) DEFAULT NULL COMMENT '关联编号',
|
||||
`supplier_selection` text COMMENT '供应商选择',
|
||||
`receiver` varchar(32) DEFAULT NULL COMMENT '接单人',
|
||||
`receiving_time` date DEFAULT NULL COMMENT '接单时间',
|
||||
`notes` varchar(200) DEFAULT NULL COMMENT '备注',
|
||||
`is_done` int(1) NOT NULL DEFAULT '0' COMMENT '是否处理完成'
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
--
|
||||
-- 转存表中的数据 `purchase_order_confirmation`
|
||||
--
|
||||
|
||||
INSERT INTO `purchase_order_confirmation` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `association_number`, `supplier_selection`, `receiver`, `receiving_time`, `notes`, `is_done`) VALUES
|
||||
('1691363659080638466', 'admin', '2023-08-15 16:18:15', NULL, NULL, 'A01A03', '1003', '[{\"supplierID\":\"1690444013968150530\",\"supplier\":\"黄晖有限公司\",\"goods\":[{\"name\":\"测试\",\"number\":\"测试\",\"unit\":\"测试\"}]},{\"supplierID\":\"1691365161122471937\",\"supplier\":\"测试流程\",\"goods\":[{\"name\":\"1\",\"number\":\"321\",\"unit\":\"123\"}]},{\"supplierID\":\"1690736576735887362\",\"supplier\":\"super军用火炬有限公司\",\"goods\":[{\"name\":\"123\",\"number\":\"123\",\"unit\":\"123\"},{\"name\":\"物品1\",\"number\":\"1\",\"unit\":\"个\"}]}]', 'admin', '2023-08-15', '', 0),
|
||||
('1691478908510806018', NULL, '2023-08-15 23:56:13', NULL, NULL, NULL, '1004', '[{\"supplierID\":\"1690444013968150530\",\"supplier\":\"黄晖有限公司\",\"goods\":[{\"name\":\"测试\",\"number\":\"测试\",\"unit\":\"测试\"}]}]', 'admin', '2023-08-15', '', 0),
|
||||
('1691728833130037249', 'admin', '2023-08-16 16:29:19', NULL, NULL, 'A01A03', '1005', NULL, 'admin', '2023-08-16', '', 0),
|
||||
('1691736322919645185', NULL, '2023-08-16 16:59:05', NULL, NULL, NULL, '1006', NULL, 'admin', '2023-08-16', '', 0);
|
||||
|
||||
--
|
||||
-- 转储表的索引
|
||||
--
|
||||
|
||||
--
|
||||
-- 表的索引 `purchase_order_confirmation`
|
||||
--
|
||||
ALTER TABLE `purchase_order_confirmation`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
COMMIT;
|
||||
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
-- phpMyAdmin SQL Dump
|
||||
-- version 5.2.0
|
||||
-- https://www.phpmyadmin.net/
|
||||
--
|
||||
-- 主机： localhost
|
||||
-- 生成日期： 2023-08-16 17:41:31
|
||||
-- 服务器版本： 5.7.40-log
|
||||
-- PHP 版本： 7.4.33
|
||||
|
||||
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
|
||||
START TRANSACTION;
|
||||
SET time_zone = "+00:00";
|
||||
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
||||
/*!40101 SET NAMES utf8mb4 */;
|
||||
|
||||
--
|
||||
-- 数据库： `jeecg-boot`
|
||||
--
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- 表的结构 `purchase_request`
|
||||
--
|
||||
|
||||
CREATE TABLE `purchase_request` (
|
||||
`id` varchar(36) NOT NULL,
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '申请人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '申请日期',
|
||||
`requirement_number` varchar(32) DEFAULT NULL COMMENT '需求编号',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '申请部门',
|
||||
`demand_status` int(1) DEFAULT '1' COMMENT '需求状态',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
|
||||
`procurement_category` int(10) DEFAULT NULL COMMENT '采购类别',
|
||||
`procurement_direction` varchar(32) DEFAULT NULL COMMENT '采购方向',
|
||||
`procurement_content` text COMMENT '采购内容',
|
||||
`procurement_budget` varchar(32) DEFAULT NULL COMMENT '采购预算',
|
||||
`annex` varchar(256) DEFAULT NULL COMMENT '附件',
|
||||
`audit_results` text COMMENT '审核结果',
|
||||
`approved_by` varchar(32) DEFAULT NULL COMMENT '审批人',
|
||||
`is_receiving` int(2) DEFAULT '0' COMMENT '是否被接单'
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
--
|
||||
-- 转存表中的数据 `purchase_request`
|
||||
--
|
||||
|
||||
INSERT INTO `purchase_request` (`id`, `create_by`, `create_time`, `requirement_number`, `sys_org_code`, `demand_status`, `update_by`, `update_time`, `procurement_category`, `procurement_direction`, `procurement_content`, `procurement_budget`, `annex`, `audit_results`, `approved_by`, `is_receiving`) VALUES
|
||||
('1690723877939462146', 'admin', '2023-08-15 15:39:12', '1003', 'A01A03', 2, 'admin', '2023-08-15 16:18:15', 1, '这是采购方向', '[{\"name\":\"物品1\",\"number\":\"1\",\"unit\":\"个\"},{\"name\":\"测试\",\"number\":\"测试\",\"unit\":\"测试\"}]', '这是预算', 'temp/对第一模块的测评_1691938213370.docx,temp/OIP-C_1691939942204.jpg', '通过', 'admin', 1),
|
||||
('1691355237765455874', 'admin', '2023-08-15 15:44:47', '1004', 'A01A03', 2, NULL, '2023-08-15 23:56:13', 1, '123', '[{\"name\":\"\",\"number\":\"\",\"unit\":\"\"}]', '123', NULL, '通过', 'admin', 1),
|
||||
('1691621109553799169', 'admin', '2023-08-16 09:21:16', '1005', 'A01A03', 2, 'admin', '2023-08-16 16:29:19', 2, 'w', '[{\"name\":\"w\",\"number\":\"w\",\"unit\":\"w\"},{\"name\":\"q \",\"number\":\"n\",\"unit\":\"u\"}]', 'w', NULL, '通过', 'admin', 1),
|
||||
('1691736041100165122', 'admin', '2023-08-16 16:57:58', '1006', 'A01A03', 2, NULL, '2023-08-16 16:59:05', 1, '请求', '[{\"name\":\"qq\",\"number\":\"1\",\"unit\":\"t\"}]', '1223', NULL, '通过', 'admin', 1);
|
||||
|
||||
--
|
||||
-- 转储表的索引
|
||||
--
|
||||
|
||||
--
|
||||
-- 表的索引 `purchase_request`
|
||||
--
|
||||
ALTER TABLE `purchase_request`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
COMMIT;
|
||||
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
-- phpMyAdmin SQL Dump
|
||||
-- version 5.2.0
|
||||
-- https://www.phpmyadmin.net/
|
||||
--
|
||||
-- 主机： localhost
|
||||
-- 生成日期： 2023-08-16 17:41:46
|
||||
-- 服务器版本： 5.7.40-log
|
||||
-- PHP 版本： 7.4.33
|
||||
|
||||
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
|
||||
START TRANSACTION;
|
||||
SET time_zone = "+00:00";
|
||||
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
||||
/*!40101 SET NAMES utf8mb4 */;
|
||||
|
||||
--
|
||||
-- 数据库： `jeecg-boot`
|
||||
--
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- 表的结构 `purchase_supplier`
|
||||
--
|
||||
|
||||
CREATE TABLE `purchase_supplier` (
|
||||
`id` varchar(36) NOT NULL,
|
||||
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建日期',
|
||||
`update_by` varchar(50) DEFAULT NULL COMMENT '更新人',
|
||||
`update_time` datetime DEFAULT NULL COMMENT '更新日期',
|
||||
`sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
|
||||
`name` varchar(32) DEFAULT NULL COMMENT '供应商名称 ',
|
||||
`address` varchar(100) DEFAULT NULL COMMENT '地址',
|
||||
`phone` varchar(20) DEFAULT NULL COMMENT '联系人电话',
|
||||
`business_scope` varchar(100) DEFAULT NULL COMMENT '业务范围',
|
||||
`collaborations_number` int(11) DEFAULT '0' COMMENT '合作次数',
|
||||
`flowing_water` double(10,2) DEFAULT '0.00' COMMENT '历史流水',
|
||||
`evaluation` varchar(32) DEFAULT NULL COMMENT '综合评价'
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||
|
||||
--
|
||||
-- 转存表中的数据 `purchase_supplier`
|
||||
--
|
||||
|
||||
INSERT INTO `purchase_supplier` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `name`, `address`, `phone`, `business_scope`, `collaborations_number`, `flowing_water`, `evaluation`) VALUES
|
||||
('1690444013968150530', 'admin', '2023-08-13 03:23:54', 'admin', '2023-08-13 17:51:14', 'A01A03', '黄晖有限公司', '福建省厦门市思明区厦禾路', '15960801986', '1,2,3,4,5', 3, 20100000.00, '价格过高'),
|
||||
('1690736576735887362', 'admin', '2023-08-13 22:46:27', 'admin', '2023-08-14 14:36:35', 'A01A03', 'super军用火炬有限公司', '美国德克萨斯州欧几里得街道火炬开发区', '+1 60366666', '6', 2, 73790000.00, 'Nice Weapon'),
|
||||
('1691365161122471937', 'admin', '2023-08-15 16:24:13', NULL, NULL, 'A01A03', '测试流程', 'CRUD', 'aaaaaa?为什么可以输入中文', '1,3,5', 0, 0.00, NULL);
|
||||
|
||||
--
|
||||
-- 转储表的索引
|
||||
--
|
||||
|
||||
--
|
||||
-- 表的索引 `purchase_supplier`
|
||||
--
|
||||
ALTER TABLE `purchase_supplier`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
COMMIT;
|
||||
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
|
|
@ -169,7 +169,12 @@ public class PurchaseOrderConfirmationController extends JeecgController<Purchas
|
|||
String requireNo = purchaseRequest.getRequirementNumber();
|
||||
LambdaUpdateWrapper<PurchaseRequest> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.eq(PurchaseRequest::getRequirementNumber, requireNo)
|
||||
.set(PurchaseRequest::getIsReceiving,0);
|
||||
.set(PurchaseRequest::getIsReceiving, "0");
|
||||
purchaseRequestService.update(updateWrapper);
|
||||
//删除订单确认表中的数据
|
||||
LambdaUpdateWrapper<PurchaseOrderConfirmation> deleteWrapper = new LambdaUpdateWrapper<>();
|
||||
deleteWrapper.eq(PurchaseOrderConfirmation::getAssociationNumber, requireNo);
|
||||
purchaseOrderConfirmationService.remove(deleteWrapper);
|
||||
return Result.OK("已取消接收!");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue