UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增发票确认时间

Browse Source
dev_kcyj
anthonywj 1 year ago
parent 325f6d6961
commit 0b257f3087
5 changed files with 124 additions and 92 deletions
Show Stats Download Patch File Download Diff File

5
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -1007,13 +1007,16 @@ public class IoOrderController extends BaseController {
ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setUpdateTime(new Date());
ioOrderEntity.setUpdateUser(getUserId() + ""); ioOrderEntity.setUpdateUser(getUserId() + "");
ioOrderEntity.setConfirmUser(getUserId() + ""); ioOrderEntity.setConfirmUser(getUserId() + "");
orderService.updateByBillNo(ioOrderEntity);
if (IntUtil.value(ioOrderEntity.getCheckStatus()) != 0) { if (IntUtil.value(ioOrderEntity.getCheckStatus()) != 0) {
ioOrderEntity.setConfirmTime(new Date());
orderService.updateByBillNo(ioOrderEntity);
IoOrderEntity orderEntity = new IoOrderEntity(); IoOrderEntity orderEntity = new IoOrderEntity();
orderEntity.setBillNo(ioOrderEntity.getBillNo()); orderEntity.setBillNo(ioOrderEntity.getBillNo());
orderEntity.setCheckStatus(1); orderEntity.setCheckStatus(1);
spGetHttpClient.updateCheckStatus(orderEntity, getUserId() + ""); spGetHttpClient.updateCheckStatus(orderEntity, getUserId() + "");
} else {
orderService.updateByBillNo(ioOrderEntity);
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }

2
src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
Unescape Escape View File

@ -201,6 +201,8 @@ public class IoOrderEntity {
@TableField(value = "confirmUser") @TableField(value = "confirmUser")
private String confirmUser; private String confirmUser;
@TableField(value = "confirmTime")
private Date confirmTime;
/** /**

1
src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
Unescape Escape View File

@ -230,6 +230,7 @@ public class IoOrderResponse {
private Date checkTime; private Date checkTime;
private String checkUserName; private String checkUserName;
private String confirmUser; private String confirmUser;
private Date confirmTime;
//总金额 //总金额
private BigDecimal allAmount; private BigDecimal allAmount;
private Integer confirmStatus; private Integer confirmStatus;

4
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -80,10 +80,6 @@ public class IoOrderServiceImpl implements IoOrderService {
@Resource @Resource
IBasicBussinessTypeService basicBussinessTypeService; IBasicBussinessTypeService basicBussinessTypeService;
@Resource @Resource
InvPreinOrderService preinOrderService;
@Resource
InvPreinDetailService preinDetailService;
@Resource
InvProductDetailService invProductDetailService; InvProductDetailService invProductDetailService;
@Resource @Resource
InvProductService invProductService; InvProductService invProductService;

74
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -3144,11 +3144,20 @@ CALL Pro_Temp_ColumnWork('pur_contract', 'pageType',
1); 1);
CALL Pro_Temp_ColumnWork('device_info', 'purApplyBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''申购订单单据号''', 1); CALL Pro_Temp_ColumnWork('device_info', 'purApplyBillNo',
CALL Pro_Temp_ColumnWork('device_info', 'purOrderBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购订单单据号''', 1); 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''申购订单单据号''',
CALL Pro_Temp_ColumnWork('device_info', 'purContractBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购合同单据号''', 1); 1);
CALL Pro_Temp_ColumnWork('device_info', 'purPlanBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购计划单据号''', 1); CALL Pro_Temp_ColumnWork('device_info', 'purOrderBillNo',
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'devInType',' int NOT NULL DEFAULT b''0'' COMMENT ''是否设备入库 ：0：未启用；2.启用''', 1); 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购订单单据号''',
1);
CALL Pro_Temp_ColumnWork('device_info', 'purContractBillNo',
'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购合同单据号''',
1);
CALL Pro_Temp_ColumnWork('device_info', 'purPlanBillNo',
'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购计划单据号''',
1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'devInType',
' int NOT NULL DEFAULT b''0'' COMMENT ''是否设备入库 ：0：未启用；2.启用''', 1);
CALL Pro_Temp_ColumnWork('io_order', 'purOrderId', CALL Pro_Temp_ColumnWork('io_order', 'purOrderId',
' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''采购订单单号''', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''采购订单单号''',
@ -3224,8 +3233,6 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceRepair',
CALL Pro_Temp_ColumnWork('device_repair', 'repairDescription', CALL Pro_Temp_ColumnWork('device_repair', 'repairDescription',
' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修内容''', ' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修内容''',
1); 1);
@ -3238,7 +3245,8 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'produceBusiness',
-- ---------------------------- -- ----------------------------
-- Table structure for device_upkeep -- Table structure for device_upkeep
-- ---------------------------- -- ----------------------------
CREATE TABLE IF NOT EXISTS `device_upkeep` ( CREATE TABLE IF NOT EXISTS `device_upkeep`
(
`taskId` bigint(0) NOT NULL COMMENT '保养任务id', `taskId` bigint(0) NOT NULL COMMENT '保养任务id',
`planId` bigint(0) NULL DEFAULT NULL COMMENT '计划id', `planId` bigint(0) NULL DEFAULT NULL COMMENT '计划id',
`planName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计划名称', `planName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计划名称',
@ -3259,12 +3267,16 @@ CREATE TABLE IF NOT EXISTS `device_upkeep` (
`createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人姓名', `createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人姓名',
`updateTime` datetime(0) NULL DEFAULT NULL, `updateTime` datetime(0) NULL DEFAULT NULL,
PRIMARY KEY (`taskId`) USING BTREE PRIMARY KEY (`taskId`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务表'
ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for device_upkeep_detail -- Table structure for device_upkeep_detail
-- ---------------------------- -- ----------------------------
CREATE TABLE IF NOT EXISTS `device_upkeep_detail` ( CREATE TABLE IF NOT EXISTS `device_upkeep_detail`
(
`taskId` bigint(0) NOT NULL COMMENT '任务id', `taskId` bigint(0) NOT NULL COMMENT '任务id',
`deviceCode` varbinary(255) NOT NULL COMMENT '设备编码', `deviceCode` varbinary(255) NOT NULL COMMENT '设备编码',
`deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码',
@ -3293,12 +3305,16 @@ CREATE TABLE IF NOT EXISTS `device_upkeep_detail` (
`suggestion` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养建议', `suggestion` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养建议',
`updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更改时间', `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更改时间',
PRIMARY KEY (`taskId`, `deviceCode`) USING BTREE PRIMARY KEY (`taskId`, `deviceCode`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务明细' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务明细'
ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for device_upkeep_detail_item -- Table structure for device_upkeep_detail_item
-- ---------------------------- -- ----------------------------
CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item` ( CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item`
(
`taskId` bigint(0) NOT NULL COMMENT '任务id', `taskId` bigint(0) NOT NULL COMMENT '任务id',
`deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码', `deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码',
`itemCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目编码', `itemCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目编码',
@ -3314,7 +3330,10 @@ CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item` (
`upkeepDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养部门名称', `upkeepDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养部门名称',
`updateTime` datetime(0) NULL DEFAULT NULL, `updateTime` datetime(0) NULL DEFAULT NULL,
PRIMARY KEY (`taskId`, `deviceCode`, `itemCode`) USING BTREE PRIMARY KEY (`taskId`, `deviceCode`, `itemCode`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目'
ROW_FORMAT = Dynamic;
CALL Pro_Temp_ColumnWork('device_check_item_dict', 'type', CALL Pro_Temp_ColumnWork('device_check_item_dict', 'type',
@ -3328,17 +3347,28 @@ CALL Pro_Temp_ColumnWork('device_plan_detail_item', 'type',
' tinyint NULL DEFAULT NULL COMMENT ''项目类型''', ' tinyint NULL DEFAULT NULL COMMENT ''项目类型''',
1); 1);
INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `is_frame`,
`update_time`, `remark`) VALUES (2095, '保养任务单', 1703, 15, '/dev/deviceUpkeep', 'dev/deviceUpkeep', `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
`update_by`,
`update_time`, `remark`)
VALUES (2095, '保养任务单', 1703, 15, '/dev/deviceUpkeep', 'dev/deviceUpkeep',
NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2024-05-12 15:52:51', NULL, NULL, NULL); NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2024-05-12 15:52:51', NULL, NULL, NULL);
INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `is_frame`,
`update_time`, `remark`) VALUES (2096, '设备保养计划', 1703, 15, '/dev/deviceUpkeepPlan', 'dev/deviceUpkeepPlan', `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
`update_by`,
`update_time`, `remark`)
VALUES (2096, '设备保养计划', 1703, 15, '/dev/deviceUpkeepPlan', 'dev/deviceUpkeepPlan',
NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-12 17:35:06', NULL, NULL, NULL); NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-12 17:35:06', NULL, NULL, NULL);
INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
`is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `is_frame`,
`update_time`, `remark`) VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-14 15:02:50', NULL, NULL, NULL); `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
`update_by`,
`update_time`, `remark`)
VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', '0',
NULL, NULL, '超级用户', '2024-05-14 15:02:50', NULL, NULL, NULL);
CALL Pro_Temp_ColumnWork('io_order', 'confirmTime', 'datetime(0) NULL DEFAULT NULL COMMENT ''发票确认时间''', 1);
CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'livePath', CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'livePath',
'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''', 'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''',

Write Preview
Loading…
Cancel
Save