Commit c4375ad49f5ee2029a42113803cf41777564ccb0

Authored by yeqianyong
1 parent 00397ca9

楚江erp:订货单规格变更修改逻辑调整

... ... @@ -916,7 +916,7 @@ create table `tbl_replenishment_order_line`
916 916 `shipped_quantity` decimal(15, 4) COMMENT '实发(t)',
917 917 `supplementary_quantity` decimal(15, 4) COMMENT '需求补发(t/件)',
918 918 `confirmed_delivery_date` DATE COMMENT '生产科确认交付日期',
919   - `remarks` TEXT COMMENT '备注',
  919 + `remarks` TEXT COMMENT '备注',sys_data_dic
920 920 `show_order` INT DEFAULT 0 COMMENT '排序',
921 921 `item_id` varchar(50) COMMENT '前端用ID',
922 922 `create_by_id` varchar(32) not null comment '创建人ID',
... ... @@ -925,4 +925,8 @@ create table `tbl_replenishment_order_line`
925 925 `update_by` varchar(20) not null comment '更新人',
926 926 `create_time` datetime default now() comment '创建时间',
927 927 `update_time` datetime default now() comment '更新时间'
928   -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '补货单物料行' ROW_FORMAT = DYNAMIC;
\ No newline at end of file
  928 +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '补货单物料行' ROW_FORMAT = DYNAMIC;
  929 +
  930 +
  931 +alter table sys_dept add column user_id varchar(32) comment '部门负责人';
  932 +alter table sys_data_dic_item modify column name varchar(50) comment '名称';
\ No newline at end of file
... ...
... ... @@ -322,17 +322,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
322 322 purchaseOrderLineService.create(createVo);
323 323 }
324 324 // 重新发起流程
325   - Boolean output = data.getOutput();
326   - if (BooleanUtils.isTrue(output)) {
327   - // 获取办事处数据
328   - String deptCode = transactorHandler.returnDeptCode(data.getCreateById());
329   - if (StringUtils.isNotBlank(deptCode)) {
330   - data.setDeptCode(deptCode);
331   - }
332   - flowInstanceWrapperService.startInstance("SPEC_CHANGE_CONFIRM", vo.getId(), "SPEC_CHANGE_CONFIRM", data);
333   - } else {
334   - flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data);
335   - }
  325 + flowInstanceWrapperService.startInstance("SPEC_CHANGE_SUBMIT", vo.getId(), BPM_FLAG, data);
336 326
337 327 OpLogUtil.setVariable("id", data.getId());
338 328 OpLogUtil.setExtra(vo);
... ...