增加 交接班接口

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -14,6 +14,7 @@ import me.zhyd.oauth.utils.AuthStateUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.auth.domain.vo.LoginTenantVo;
 import org.dromara.auth.domain.vo.LoginVo;
+import org.dromara.auth.domain.vo.PDALoginVo;
 import org.dromara.auth.domain.vo.TenantListVo;
 import org.dromara.auth.form.RegisterBody;
 import org.dromara.auth.form.SocialLoginBody;
@@ -119,7 +120,7 @@ public class TokenController {
         // 校验租户
         sysLoginService.checkTenant(loginBody.getTenantId());
         // 登录
-        LoginVo loginVo = IAuthStrategy.login(body, clientVo, grantType);
+        PDALoginVo loginVo = (PDALoginVo) IAuthStrategy.login(body, clientVo, grantType);
         return R.ok(loginVo);
     }
 

ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/PDALoginVo.java

@@ -0,0 +1,8 @@
+package org.dromara.auth.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class PDALoginVo extends LoginVo{
+    private String nickname;
+}

ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java

@@ -30,8 +30,6 @@ public interface IAuthStrategy {
             throw new ServiceException("授权类型不正确!");
         }
         IAuthStrategy instance = SpringUtils.getBean(beanName);
-        System.out.println("真实类型="+beanName);
-        System.out.println(instance instanceof PdaAuthStrategy);
         return instance.login(body, client);
     }
 

ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PdaAuthStrategy.java

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.auth.domain.vo.LoginVo;
+import org.dromara.auth.domain.vo.PDALoginVo;
 import org.dromara.auth.form.PasswordLoginBody;
 import org.dromara.auth.properties.CaptchaProperties;
 import org.dromara.auth.service.IAuthStrategy;
@@ -46,7 +47,7 @@ public class PdaAuthStrategy implements IAuthStrategy {
     private RemoteUserService remoteUserService;
 
     @Override
-    public LoginVo login(String body, RemoteClientVo client) {
+    public PDALoginVo login(String body, RemoteClientVo client) {
         System.out.println("PDA service");
         PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
         ValidatorUtils.validate(loginBody);
@@ -76,11 +77,12 @@ public class PdaAuthStrategy implements IAuthStrategy {
         model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
         // 生成token
         LoginHelper.login(loginUser, model);
-
-        LoginVo loginVo = new LoginVo();
+        System.out.println("PDA service"+loginUser.getNickname());
+        PDALoginVo loginVo = new PDALoginVo();
         loginVo.setAccessToken(StpUtil.getTokenValue());
         loginVo.setExpireIn(StpUtil.getTokenTimeout());
         loginVo.setClientId(client.getClientId());
+        loginVo.setNickname(loginUser.getNickname());
         return loginVo;
     }
 

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java

@@ -3,13 +3,16 @@ package org.dromara.wms.controller;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.wms.domain.ShiftChange;
 import org.dromara.wms.domain.WmsInventory;
 import org.dromara.wms.domain.bo.WmsReturnOrderBo;
 import org.dromara.wms.domain.vo.*;
 import org.dromara.wms.service.*;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RequiredArgsConstructor
 @RestController
@@ -194,4 +197,22 @@ public class WmsPdaApiController extends BaseController {
         Boolean result = apiService.semiSubmitOutInfo(vo);
         return result ? R.ok() : R.fail();
     }
+
+    /**
+     * 查询班组和班次列表
+     * @return 自定义类
+     */
+    @PostMapping("/selectTeams")
+    public R<List<TeamInfoVo>> selectTeams() {
+        List<TeamInfoVo> teamList =apiService.selectTeams();
+        return R.ok(teamList);
+    }
+    @PostMapping("/shiftChangeSubmit")
+    public R<Void> shiftChangeSubmit(ShiftChange shiftChange) {
+        Boolean result = apiService.shiftChangeSubmit(shiftChange);
+        return result ? R.ok() : R.fail();
+    }
+
+
+
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/ShiftChange.java

@@ -0,0 +1,14 @@
+package org.dromara.wms.domain;
+
+import lombok.Data;
+import org.dromara.common.tenant.core.TenantEntity;
+
+@Data
+public class ShiftChange extends TenantEntity {
+    // INSERT INTO prod_shift_change (shift_id, class_team_id, user_id, user_name)
+    // VALUES (1, 1, 1, N'admin');
+    private Long shiftId;
+    private Long classTeamId;
+    private Long userId;
+    private String userName;
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/TeamInfoVo.java

@@ -0,0 +1,10 @@
+package org.dromara.wms.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class TeamInfoVo {
+    private Long teamId;
+    private String teamName;
+    private String type;
+}

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java

@@ -1,9 +1,12 @@
 package org.dromara.wms.mapper;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.dromara.wms.domain.ShiftChange;
 import org.dromara.wms.domain.WmsPsmInLoad;
 import org.dromara.wms.domain.WmsPsmInLoadDetail;
 import org.dromara.wms.domain.WmsPsmInStock;
+import org.dromara.wms.domain.vo.TeamInfoVo;
 import org.dromara.wms.domain.vo.WmsPsmInLoadVo;
 import org.springframework.stereotype.Repository;
 
@@ -21,5 +24,13 @@ public interface WmsPdaApiMapper {
 
     void insertInStockDetail(@Param("id") Long inStockId, @Param("list") List<WmsPsmInLoadDetail> list);
 
-    void insertPsmStorage(@Param("list") List<WmsPsmInLoadDetail> list,@Param("data") WmsPsmInStock vo);
+    void insertPsmStorage(@Param("list") List<WmsPsmInLoadDetail> list, @Param("data") WmsPsmInStock vo);
+
+    @Select("select class_team_id as teamId, team_name as teamName, '班组' as type\n" +
+        "from base_class_team_info union\n" +
+        "select shift_id as teamId, shift_name as teamName, '班次' as type\n" +
+        "from base_shift_info;")
+    List<TeamInfoVo> selectTeams();
+
+    int shiftChangeSubmit(ShiftChange shiftChange);
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java

@@ -1,5 +1,6 @@
 package org.dromara.wms.service;
 
+import org.dromara.wms.domain.ShiftChange;
 import org.dromara.wms.domain.vo.*;
 
 import java.util.List;
@@ -30,4 +31,8 @@ public interface IWmsPdaApiService {
     List<WmsOutstockDetailVo> outSelectByOrderCode(String orderCode);
 
     WmsInventoryVo selectInVentoryByBatchCode(String bacthCode, String locationCode);
+
+    List<TeamInfoVo> selectTeams();
+
+    Boolean shiftChangeSubmit(ShiftChange shiftChange);
 }

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml

@@ -67,4 +67,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     </insert>
+
+
+    <insert id="shiftChangeSubmit" parameterType="org.dromara.wms.domain.ShiftChange">
+        INSERT INTO prod_shift_change (shift_id, class_team_id, user_id, user_name,shift_change_time,create_by,create_time)
+        VALUES (#{shiftId}, #{classTeamId}, #{userId}, #{userName},getdate(), #{userId},getdate());
+    </insert>
 </mapper>