设备发货更新

sop-api/src/main/java/com/qmth/sop/server/api/TBDeviceDeliveryController.java

@@ -45,6 +45,7 @@ public class TBDeviceDeliveryController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
     @OperationLog(logType = LogTypeEnum.EDIT)
+    @Transactional
     public Result save(@Valid @ApiParam(value = "设备发货修改信息", required = true) @RequestBody TBDeviceDelivery tbDeviceDelivery, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
@@ -57,7 +58,7 @@ public class TBDeviceDeliveryController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = Object.class)})
     @OperationLog(logType = LogTypeEnum.UPDATE)
     @Transactional
-    public Result statusUpdate(@ApiParam(value = "设备发货表id", required = true) @RequestParam Long id,
+    public Result statusUpdate(@ApiParam(value = "设备发货id", required = true) @RequestParam Long id,
                                @ApiParam(value = "设备发货状态", required = true) @RequestParam DeviceDeliveryStatusEnum status) {
         TBDeviceDelivery tbDeviceDelivery = tbDeviceDeliveryService.getById(id);
         Optional.ofNullable(tbDeviceDelivery).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到设备发货信息"));
@@ -83,6 +84,6 @@ public class TBDeviceDeliveryController {
             }
             tbDeviceDeliveryService.saveOrUpdateBatch(tbDeviceDeliveryList);
         }
-        return ResultUtil.ok();
+        return ResultUtil.ok(true);
     }
 }

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -2268,4 +2268,37 @@ INSERT INTO sys_privilege
 VALUES(3063, '发货', 'Deliver', 'LINK', 3053, 3, 'AUTH', NULL, 1, 0, 1);
 INSERT INTO sys_privilege
 (id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
-VALUES(3064, '签收', 'Receive', 'LINK', 3053, 4, 'AUTH', NULL, 1, 0, 1);
+VALUES(3064, '签收', 'Receive', 'LINK', 3053, 4, 'AUTH', NULL, 1, 0, 1);
+
+--2023.11.29update
+UPDATE sys_privilege
+SET name='批量发货', url='BatchDeliver', `type`='BUTTON', parent_id=3053, `sequence`=3, property='AUTH', related='3067', enable=1, default_auth=0, front_display=1
+WHERE id=3058;
+UPDATE sys_privilege
+SET name='批量签收', url='BatchReceive', `type`='BUTTON', parent_id=3053, `sequence`=4, property='AUTH', related='3067', enable=1, default_auth=0, front_display=1
+WHERE id=3059;
+UPDATE sys_privilege
+SET name='批量作废', url='BatchCancel', `type`='BUTTON', parent_id=3053, `sequence`=5, property='AUTH', related='3067', enable=1, default_auth=0, front_display=1
+WHERE id=3060;
+UPDATE sys_privilege
+SET name='修改', url='Update', `type`='LINK', parent_id=3053, `sequence`=1, property='AUTH', related='3065', enable=1, default_auth=0, front_display=1
+WHERE id=3061;
+UPDATE sys_privilege
+SET name='作废', url='Cancel', `type`='LINK', parent_id=3053, `sequence`=2, property='AUTH', related='3066', enable=1, default_auth=0, front_display=1
+WHERE id=3062;
+UPDATE sys_privilege
+SET name='发货', url='Deliver', `type`='LINK', parent_id=3053, `sequence`=3, property='AUTH', related='3066', enable=1, default_auth=0, front_display=1
+WHERE id=3063;
+UPDATE sys_privilege
+SET name='签收', url='Receive', `type`='LINK', parent_id=3053, `sequence`=4, property='AUTH', related='3066', enable=1, default_auth=0, front_display=1
+WHERE id=3064;
+
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3065, '设备发货修改接口', '/api/admin/device/delivery/save', 'URL', 36, 1, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3066, '设备发货状态修改接口', '/api/admin/device/delivery/status/update', 'URL', 36, 2, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO sys_privilege
+(id, name, url, `type`, parent_id, `sequence`, property, related, enable, default_auth, front_display)
+VALUES(3067, '设备发货状态批量修改接口', '/api/admin/device/delivery/status/batch/update', 'URL', 36, 3, 'AUTH', NULL, 1, 1, 0);