Browse Source

1.车间解缴出库app端入库恢复,等待下期看用户需要是否采用PC端入口 2. 修改增加用户的type类型,与用户登录时使用的type类型一致

liuhong 2 months ago
parent
commit
a232a14fa1

+ 11 - 11
src/main/java/com/sy/coinage/app/controller/AppWorkshopOutboundController.java

@@ -61,17 +61,17 @@ public class AppWorkshopOutboundController extends BaseController {
     private IWorkshopTransferService workshopTransferService;
     private IWorkshopTransferService workshopTransferService;
 
 
     // =========== 车间出库
     // =========== 车间出库
-//    @ApiOperation(value = "3.1 app添加车间解缴出库")
-//    @Operation(value = "app添加车间解缴出库")
-//    @PostMapping("/add")
-//    public Object add(@RequestBody @ApiParam(value = "新增请求bean") @Validated({Create.class}) WorkshopOutboundReq req,
-//                      @CurrentUser CacheUserVO user) throws ParseException {
-//        if (req.getAutoLs() == null && req.getManualLs() == null) {
-//            throw new ReadTimeoutException("扫描的rfid列表与手动录入rfid列表不能都为空");
-//        }
-//        this.workshopOutboundService.shopOut(req, user);
-//        return "";
-//    }
+    @ApiOperation(value = "3.1 app添加车间解缴出库")
+    @Operation(value = "app添加车间解缴出库")
+    @PostMapping("/add")
+    public Object add(@RequestBody @ApiParam(value = "新增请求bean") @Validated({Create.class}) WorkshopOutboundReq req,
+                      @CurrentUser CacheUserVO user) throws ParseException {
+        if (req.getAutoLs() == null && req.getManualLs() == null) {
+            throw new ReadTimeoutException("扫描的rfid列表与手动录入rfid列表不能都为空");
+        }
+        this.workshopOutboundService.shopOut(req, user);
+        return "";
+    }
 
 
     @ApiOperation(value = "3.2 app添加车间内部出库")
     @ApiOperation(value = "3.2 app添加车间内部出库")
     @Operation(value = "app添加车间内部出库")
     @Operation(value = "app添加车间内部出库")

+ 7 - 1
src/main/java/com/sy/coinage/sys/service/impl/UserServiceImpl.java

@@ -85,7 +85,13 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements IUser
         model.setStatus(Constants.STATUS_USABLE);
         model.setStatus(Constants.STATUS_USABLE);
         model.setDelFlag(Constants.STATUS_USABLE);
         model.setDelFlag(Constants.STATUS_USABLE);
         model.setPwdInit(Constants.STATUS_USABLE);
         model.setPwdInit(Constants.STATUS_USABLE);
-        model.setType(Constants.STATUS_USABLE);
+        //todo date=20240715 此处添加用户需要变为2,登录时查询的条件时type>1
+        //<old>
+//        model.setType(Constants.STATUS_USABLE);
+        //</old>
+        //<new>
+        model.setType(Constants.STATUS_FORBIDDEN);
+        //</new>
         // 生成六位随机盐
         // 生成六位随机盐
         model.setSalt(RandomUtil.randomStr(6));
         model.setSalt(RandomUtil.randomStr(6));
         // 密码加盐MD5加密
         // 密码加盐MD5加密