设备管理更新

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

@@ -41,7 +41,7 @@ public class DeviceDeliveryManageController {
     @OperationLog(logType = LogTypeEnum.UPDATE)
     public Result sign(@ApiParam(value = "设备发货id", required = true) @RequestParam String id) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        tbDeviceDeliveryService.sign(id ,requestUser.getId());
+        tbDeviceDeliveryService.sign(SystemConstant.convertIdToLong(id) ,requestUser.getId());
         return ResultUtil.ok();
     }
 
@@ -51,7 +51,7 @@ public class DeviceDeliveryManageController {
     @OperationLog(logType = LogTypeEnum.UPDATE)
     public Result unsigned(@ApiParam(value = "设备发货id", required = true) @RequestParam String id) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        tbDeviceDeliveryService.unsigned(id, requestUser.getId());
+        tbDeviceDeliveryService.unsigned(SystemConstant.convertIdToLong(id), requestUser.getId());
         return ResultUtil.ok();
     }
 
@@ -63,14 +63,14 @@ public class DeviceDeliveryManageController {
     public Result signEdit(@ApiParam(value = "设备发货id", required = true) @RequestParam String id,
                            @ApiParam(value = "设备状态", required = true) @RequestParam DeviceStatusEnum deviceStatus) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        tbDeviceDeliveryService.signEdit(id, deviceStatus, requestUser.getId());
+        tbDeviceDeliveryService.signEdit(SystemConstant.convertIdToLong(id), deviceStatus, requestUser.getId());
         return ResultUtil.ok();
     }
 
     @ApiOperation(value = "设备去处登记列表查询")
     @RequestMapping(value = "/place/list", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "返回信息", response = DevicePlaceResult.class) })
-    public Result placeList(@ApiParam(value = "派单号") @RequestParam String crmNo) {
+    public Result placeList(@ApiParam(value = "派单号", required = true) @RequestParam String crmNo) {
         return ResultUtil.ok(tbDeviceDeliveryService.placeList(crmNo));
     }
 
@@ -84,7 +84,7 @@ public class DeviceDeliveryManageController {
                      @ApiParam(value = "快递单号:入库方式-选择邮寄不能为空", required = false) @RequestParam String expressNo,
                      @ApiParam(value = "备注:入库方式-选择其他的时候不能为空", required = false) @RequestParam String remark) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        tbDeviceDeliveryService.in(id, inMode, expressNo, remark, requestUser.getId());
+        tbDeviceDeliveryService.in(SystemConstant.convertIdToLong(id), inMode, expressNo, remark, requestUser.getId());
         return ResultUtil.ok();
     }
 
@@ -98,7 +98,7 @@ public class DeviceDeliveryManageController {
                            @ApiParam(value = "接收方单号", required = true) @RequestParam String receiveCrmNo,
                            @ApiParam(value = "备注", required = false) @RequestParam String remark) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        tbDeviceDeliveryService.transfer(id, transferMode, expressNo, receiveCrmNo, remark, requestUser.getId());
+        tbDeviceDeliveryService.transfer(SystemConstant.convertIdToLong(id), transferMode, expressNo, receiveCrmNo, remark, requestUser.getId());
         return ResultUtil.ok();
     }
 

sop-business/src/main/java/com/qmth/sop/business/bean/result/DevicePlaceResult.java

@@ -41,9 +41,6 @@ public class DevicePlaceResult implements Serializable {
     @ApiModelProperty("其他运输方式说明")
     private String remark;
 
-    @ApiModelProperty("中转的快递单号")
-    private String transferExpressNo;
-
     public Long getId() {
         return id;
     }
@@ -124,11 +121,4 @@ public class DevicePlaceResult implements Serializable {
         this.remark = remark;
     }
 
-    public String getTransferExpressNo() {
-        return transferExpressNo;
-    }
-
-    public void setTransferExpressNo(String transferExpressNo) {
-        this.transferExpressNo = transferExpressNo;
-    }
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBDeviceDeliveryService.java

@@ -202,20 +202,20 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param  id 设备出库ID
      * @param userId 操作用户ID
      */
-    void sign(String id, Long userId);
+    void sign(Long id, Long userId);
 
     /**
      * @param  id 设备出库ID
      * @param userId 操作用户ID
      */
-    void unsigned(String id, Long userId);
+    void unsigned(Long id, Long userId);
 
     /**
      * @param  id 设备出库ID
      * @param  deviceStatus 设备状态
      * @param userId 操作用户ID
      */
-    void signEdit(String id, DeviceStatusEnum deviceStatus, Long userId);
+    void signEdit(Long id, DeviceStatusEnum deviceStatus, Long userId);
 
     /**
      * @param crmNo 派单号
@@ -231,7 +231,7 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param remark  备注
      * @param userId 登录用户
      */
-    void in(String id, MailTypeEnum inMode, String expressNo, String remark, Long userId);
+    void in(Long id, MailTypeEnum inMode, String expressNo, String remark, Long userId);
 
     /**
      *
@@ -242,7 +242,7 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @param remark 备注
      * @param userId 登录用户
      */
-    void transfer(String id, MailTypeEnum transferMode, String expressNo, String receiveCrmNo, String remark, Long userId);
+    void transfer(Long id, MailTypeEnum transferMode, String expressNo, String receiveCrmNo, String remark, Long userId);
 
     /**
      *

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -738,7 +738,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
     @Override
     @Transactional
-    public void sign(String id, Long userId) {
+    public void sign(Long id, Long userId) {
         TBDeviceDelivery deviceDelivery = getById(id);
         if (Objects.isNull(deviceDelivery)) {
             throw ExceptionResultEnum.ERROR.exception(String.format("设备发货记录不存在，ID:[%s]", id));
@@ -757,8 +757,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
             this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getId, deviceDelivery.getSourceId())
                     .set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.TRANSFER_SIGN)
                     .set(TBDeviceDelivery::getReceiveUserId, userId).set(TBDeviceDelivery::getReceiveTime, now)
-                    .set(TBDeviceDelivery::getEffect, Boolean.FALSE).set(TBDeviceDelivery::getUpdateId, userId)
-                    .set(TBDeviceDelivery::getUpdateTime, now));
+                    .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, now));
         }
         //更新设备状态为使用中
         this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getId, id)
@@ -769,7 +768,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
     @Override
     @Transactional
-    public void unsigned(String id, Long userId) {
+    public void unsigned(Long id, Long userId) {
         TBDeviceDelivery deviceDelivery = getById(id);
         if (Objects.isNull(deviceDelivery)) {
             throw ExceptionResultEnum.ERROR.exception(String.format("设备发货记录不存在，ID:[%s]", id));
@@ -785,8 +784,8 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                         String.format("找不到中转设备的发货来源, 发货ID:[%s]", deviceDelivery.getSourceId()));
             }
             this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getId, deviceDelivery.getSourceId())
-                    .set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.TRANSFER).set(TBDeviceDelivery::getEffect, Boolean.TRUE)
-                    .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, now));
+                    .set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.TRANSFER).set(TBDeviceDelivery::getUpdateId, userId)
+                    .set(TBDeviceDelivery::getUpdateTime, now));
         }
 
         this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getId, id)
@@ -797,7 +796,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
     @Override
     @Transactional
-    public void signEdit(String id, DeviceStatusEnum deviceStatus, Long userId) {
+    public void signEdit(Long id, DeviceStatusEnum deviceStatus, Long userId) {
         TBDeviceDelivery deviceDelivery = getById(id);
         if (Objects.isNull(deviceDelivery)) {
             throw ExceptionResultEnum.ERROR.exception(String.format("设备发货记录不存在，ID:[%s]", id));
@@ -805,7 +804,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         if (deviceDelivery.getDeviceStatus().equals(deviceStatus)) {
             throw ExceptionResultEnum.ERROR.exception("未做改动");
         }
-        //更新设备发货记录饿设备状态
+        //更新设备发货记录的设备状态
         this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getId, id)
                 .set(TBDeviceDelivery::getDeviceStatus, deviceStatus).set(TBDeviceDelivery::getUpdateId, userId)
                 .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis()));
@@ -836,10 +835,10 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 TBDeviceDelivery inDeviceDelivery = baseMapper.selectOne(
                         new QueryWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getCrmNo, crmNo)
                                 .eq(TBDeviceDelivery::getSerialNo, result.getSerialNo())
-                                .eq(TBDeviceDelivery::getDeliveryType, InOutTypeEnum.IN));
+                                .eq(TBDeviceDelivery::getDeliveryType, InOutTypeEnum.IN).last(SystemConstant.LIMIT1));
                 if (Objects.isNull(inDeviceDelivery)) {
-                    throw ExceptionResultEnum.ERROR.exception(
-                            String.format("派单号crmNo:[%s],设备序列号serialNo:[%s]未有入库记录", crmNo, result.getSerialNo()));
+                    log.error(String.format("派单号crmNo:[%s],设备序列号serialNo:[%s]未有入库记录", crmNo, result.getSerialNo()));
+                    continue;
                 }
                 result.setTransportMode(getTransportMode(inDeviceDelivery.getExpressNo(), inDeviceDelivery.getRemark()));
                 //设备是否已经被签收
@@ -851,10 +850,11 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 TBDeviceDelivery transferDeviceDelivery = baseMapper.selectOne(
                         new QueryWrapper<TBDeviceDelivery>().lambda().eq(TBDeviceDelivery::getSourceId, result.getId()));
                 if (Objects.isNull(transferDeviceDelivery)) {
-                    throw ExceptionResultEnum.ERROR.exception(String.format("中转的设备找不到接收方,发货设备ID:[%s]", result.getId()));
+                    log.error(String.format("中转的设备找不到接收方,发货设备ID:[%s]", result.getId()));
+                    continue;
                 }
                 result.setReceiveCrmNo(transferDeviceDelivery.getCrmNo());
-                result.setTransportMode(getTransportMode(result.getTransferExpressNo(), result.getRemark()));
+                result.setTransportMode(getTransportMode(transferDeviceDelivery.getExpressNo(), result.getRemark()));
                 //设备是否已经被签收
                 result.setHaveSign(result.getStatus().equals(DeviceDeliveryStatusEnum.TRANSFER_SIGN) ? Boolean.TRUE : Boolean.FALSE);
             }
@@ -865,7 +865,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
     @Override
     @Transactional
-    public void in(String id, MailTypeEnum inMode, String expressNo, String remark, Long userId) {
+    public void in(Long id, MailTypeEnum inMode, String expressNo, String remark, Long userId) {
         checkInAndTransfer(inMode, expressNo, remark, InOutTypeEnum.IN);
         TBDeviceDelivery deviceDelivery = getById(id);
         if (Objects.isNull(deviceDelivery)) {
@@ -879,8 +879,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
             this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getExpressNo, expressNo)
                     .set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.IN)
                     .set(TBDeviceDelivery::getDeliverTime, System.currentTimeMillis()).set(TBDeviceDelivery::getDeliverUserId, userId)
-                    .set(TBDeviceDelivery::getEffect, Boolean.FALSE).set(TBDeviceDelivery::getUpdateId, userId)
-                    .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
+                    .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
                     .set(TBDeviceDelivery::getDeviceStatus, deviceDelivery.getDeviceStatus()).set(TBDeviceDelivery::getRemark, remark)
                     .eq(TBDeviceDelivery::getId, existDeviceDelivery.getId()));
         } else {
@@ -891,8 +890,8 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         //更改设备使用状态为入库
         this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.IN)
                 .set(TBDeviceDelivery::getMailType, inMode).set(TBDeviceDelivery::getRemark, remark)
-                .set(TBDeviceDelivery::getEffect, Boolean.FALSE).set(TBDeviceDelivery::getUpdateId, userId)
-                .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis()).eq(TBDeviceDelivery::getId, id));
+                .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
+                .eq(TBDeviceDelivery::getId, id));
     }
 
     private void checkInAndTransfer(MailTypeEnum inMode, String expressNo, String remark, InOutTypeEnum inOutType) {
@@ -909,7 +908,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
 
     @Override
     @Transactional
-    public void transfer(String id, MailTypeEnum transferMode, String expressNo, String receiveCrmNo, String remark, Long userId) {
+    public void transfer(Long id, MailTypeEnum transferMode, String expressNo, String receiveCrmNo, String remark, Long userId) {
         checkInAndTransfer(transferMode, expressNo, remark, InOutTypeEnum.OUT);
         TBDeviceDelivery deviceDelivery = getById(id);
         if (Objects.isNull(deviceDelivery)) {
@@ -926,9 +925,9 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         }
         //更新使用状态为中转
         this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.TRANSFER)
-                .set(TBDeviceDelivery::getEffect, Boolean.FALSE).set(TBDeviceDelivery::getRemark, remark)
-                .set(TBDeviceDelivery::getMailType, transferMode).set(TBDeviceDelivery::getUpdateId, userId)
-                .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis()).eq(TBDeviceDelivery::getId, id));
+                .set(TBDeviceDelivery::getRemark, remark).set(TBDeviceDelivery::getMailType, transferMode)
+                .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
+                .eq(TBDeviceDelivery::getId, id));
 
         //新增一条发货记录
         saveTransferDeviceDelivery(receiveCrmNo, expressNo, remark, userId, deviceDelivery);
@@ -944,16 +943,14 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
             if (devicePlaceParam.getTransferStatus().equals(DeviceUseStatusEnum.IN)) {
                 this.update(
                         new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getExpressNo, devicePlaceParam.getExpressNo())
-                                .set(TBDeviceDelivery::getEffect, Boolean.FALSE).set(TBDeviceDelivery::getUpdateId, userId)
-                                .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
+                                .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
                                 .set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark())
                                 .set(TBDeviceDelivery::getMailType, devicePlaceParam.getTransferMode())
                                 .eq(TBDeviceDelivery::getId, existDeviceDelivery.getId()));
             }
             //中转
             if (devicePlaceParam.getTransferStatus().equals(DeviceUseStatusEnum.TRANSFER)) {
-                this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getEffect, Boolean.FALSE)
-                        .set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark())
+                this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark())
                         .set(TBDeviceDelivery::getMailType, devicePlaceParam.getTransferMode()).set(TBDeviceDelivery::getUpdateId, userId)
                         .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
                         .eq(TBDeviceDelivery::getId, existDeviceDelivery.getId()));
@@ -974,7 +971,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 queryWrapper.eq(TBDeviceDelivery::getCrmNo, existDeviceDelivery.getCrmNo());
                 queryWrapper.eq(TBDeviceDelivery::getSerialNo, existDeviceDelivery.getSerialNo());
                 queryWrapper.eq(TBDeviceDelivery::getDeliveryType, InOutTypeEnum.IN);
-                queryWrapper.eq(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.IN);
+                queryWrapper.eq(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.DELIVER);
                 baseMapper.delete(queryWrapper);
                 //写入一条中转记录
                 saveTransferDeviceDelivery(devicePlaceParam.getReceiveCrmNo(), devicePlaceParam.getExpressNo(),
@@ -982,7 +979,6 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 //更新状态为中转
                 this.update(
                         new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.TRANSFER)
-                                .set(TBDeviceDelivery::getEffect, Boolean.FALSE)
                                 .set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark())
                                 .set(TBDeviceDelivery::getMailType, devicePlaceParam.getTransferMode())
                                 .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
@@ -1000,8 +996,8 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
                 //更新状态为入库
                 this.update(new UpdateWrapper<TBDeviceDelivery>().lambda().set(TBDeviceDelivery::getStatus, DeviceDeliveryStatusEnum.IN)
                         .set(TBDeviceDelivery::getMailType, devicePlaceParam.getTransferMode())
-                        .set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark()).set(TBDeviceDelivery::getEffect, Boolean.FALSE)
-                        .set(TBDeviceDelivery::getUpdateId, userId).set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
+                        .set(TBDeviceDelivery::getRemark, devicePlaceParam.getRemark()).set(TBDeviceDelivery::getUpdateId, userId)
+                        .set(TBDeviceDelivery::getUpdateTime, System.currentTimeMillis())
                         .eq(TBDeviceDelivery::getId, existDeviceDelivery.getId()));
             }
         }
@@ -1024,12 +1020,12 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         inDeviceDelivery.setSupplierId(existDeviceDelivery.getSupplierId());
         inDeviceDelivery.setExpressNo(expressNo);
         inDeviceDelivery.setDeliveryType(InOutTypeEnum.IN);
-        inDeviceDelivery.setStatus(DeviceDeliveryStatusEnum.IN);
+        inDeviceDelivery.setStatus(DeviceDeliveryStatusEnum.DELIVER);
         inDeviceDelivery.setDeliverTime(System.currentTimeMillis());
         inDeviceDelivery.setDeliverUserId(userId);
         inDeviceDelivery.setCreateTime(System.currentTimeMillis());
         inDeviceDelivery.setCreateId(userId);
-        inDeviceDelivery.setEffect(Boolean.FALSE);
+        inDeviceDelivery.setEffect(Boolean.TRUE);
         inDeviceDelivery.setDeviceStatus(existDeviceDelivery.getDeviceStatus());
         inDeviceDelivery.setRemark(remark);
         save(inDeviceDelivery);
@@ -1056,7 +1052,7 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         newDeviceDelivery.setDeliverUserId(userId);
         newDeviceDelivery.setCreateTime(System.currentTimeMillis());
         newDeviceDelivery.setCreateId(userId);
-        newDeviceDelivery.setEffect(Boolean.FALSE);
+        newDeviceDelivery.setEffect(Boolean.TRUE);
         newDeviceDelivery.setDeviceStatus(existDeviceDelivery.getDeviceStatus());
         newDeviceDelivery.setRemark(remark);
         save(newDeviceDelivery);

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

@@ -12,3 +12,21 @@ ALTER TABLE t_b_device_delivery
 ALTER TABLE t_b_device_delivery
     ADD COLUMN `mail_type` varchar(20) NULL COMMENT '邮寄方式：邮寄、其他' AFTER `remark`;
 
+-- 2024-05-21
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4000, '设备管理', 'deviceDeliveryManage', 'MENU', 36, 1, NULL, NULL, 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4010, '设备签收列表', 'List', 'LIST', 4000, 1, 'AUTH', '4018', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4011, '签收', 'Sign', 'LINK', 4000, 2, 'AUTH', '4019', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4012, '未签收', 'UnSigned', 'LINK', 4000, 3, 'AUTH', '4020', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4013, '编辑', 'Update', 'LINK', 4000, 4, 'AUTH', '4021', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4014, '设备去处列表', 'List', 'LIST', 4000, 1, 'AUTH', '4022', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4015, '入库', 'In', 'LINK', 4000, 2, 'AUTH', '4023', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4016, '中转', 'Transfer', 'LINK', 4000, 3, 'AUTH', '4024', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4017, '编辑', 'Update', 'LINK', 4000, 4, 'AUTH', '4025', 1, 0, 1);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4018, '设备签收列表', '/api/admin/device/manage/sign/list', 'URL', 4000, 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 (4019, '设备签收', '/api/admin/device/manage/sign', 'URL', 4000, 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 (4020, '设备未签收', '/api/admin/device/manage/unsigned', 'URL', 4000, 3, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4021, '设备签收编辑', '/api/admin/device/manage/sign/edit', 'URL', 4000, 4, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4022, '设备去处列表', '/api/admin/device/manage/place/list', 'URL', 4000, 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 (4023, '设备去处入库', '/api/admin/device/manage/in', 'URL', 4000, 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 (4024, '设备去处中转', '/api/admin/device/manage/transfer', 'URL', 4000, 3, 'AUTH', NULL, 1, 1, 0);
+INSERT INTO sys_privilege(id, name, url, type, parent_id, sequence, property, related, enable, default_auth, front_display) VALUES (4025, '设备去处编辑', '/api/admin/device/manage/place/edit', 'URL', 4000, 4, 'AUTH', NULL, 1, 1, 0);

sop-business/src/main/resources/mapper/TBDeviceDeliveryMapper.xml

@@ -224,8 +224,7 @@
             sd.STATUS deviceStatus,
             sp.NAME supplierName,
             d.STATUS,
-            d.remark,
-            d.transfer_express_no transferExpressNo
+            d.remark
         FROM
             t_b_device_delivery d,
             sys_device sd,