修改多选设置为空托接口

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -77,9 +77,9 @@ public class StartService implements CommandLineRunner {
         //取消写合格左正在下料
 //        PlcService.plcWritepassedProductLeftBlanking1();
 //        //测试合格品左上空托
-//        plcCallAgvService.readTheEmptyPalletOnThequalifiedLeftTest();
+        plcCallAgvService.readTheEmptyPalletOnThequalifiedLeftTest();
         //测试合格品右上空托
-        plcCallAgvService.readTheEmptyPalletOnThequalifiedRightTest();
+//        plcCallAgvService.readTheEmptyPalletOnTheNoqualifiedRightTest();
     }
 
     /**
@@ -89,9 +89,9 @@ public class StartService implements CommandLineRunner {
         //取消写合格品左正在下料
 //        PlcService.plcWritepassedProductLeftBlanking1();
         //测试合格品左下料
-        plcCallAgvService.readThepassedProductLowerFeeLeftTest();
+//        plcCallAgvService.readThepassedProductLowerFeeLeftTest();
         //测试合格品右下料
-//        plcCallAgvService.readThepassedProductLowerFeeRightTest();
+        plcCallAgvService.readThepassedProductLowerFeeRightTest();
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/LocationViewSafeController.java

@@ -82,13 +82,13 @@ public class LocationViewSafeController extends BaseController {
         return invLotLocIdService.clear(id.toString(),Constant.WAREHOUSE_ID, logger.getName());
     }
 
-    @Log(title = "库存有货状态调整", businessType = BusinessType.CLEAN)
+    @Log(title = "库存有货状态调整", businessType = BusinessType.UPDATE)
     @GetMapping(value = "/setIsEmpty/{id}")
     public AjaxResult adjLocationIsEmpty(@PathVariable("id") Long id) {
         return invLotLocIdService.adjLocationIsEmpty(id.toString(), Constant.WAREHOUSE_ID, logger.getName());
     }
 
-    @Log(title = "设置库存信息为空托", businessType = BusinessType.CLEAN)
+    @Log(title = "设置库存信息为空托", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/setIsEmptyPallent/{id}")
     public AjaxResult setIsEmptyPallent(@PathVariable("id") Long id) {
         invLotLocIdService.clear(id.toString(),Constant.WAREHOUSE_ID, logger.getName());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaInvLotLocIdController.java

@@ -19,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -165,13 +167,12 @@ public class PdaInvLotLocIdController {
      * 多选设置为空托
      *
      */
-    @Log(title = "设置为空托", businessType = BusinessType.binLocationReleaseList)
+    @Log(title = "多选设置为空托", businessType = BusinessType.UPDATE)
     @PostMapping("/binLocationReleaseList")
-    public AjaxResult binLocationReleaseList(@RequestBody List<InvLotLocIdMoveForm> invLotLocIdMoveFormList) {
+    public AjaxResult binLocationReleaseList(@RequestBody Map<String,List<InvLotLocIdMoveForm>> map) {
+        List<InvLotLocIdMoveForm> invLotLocIdMoveFormList = map.get("invLotLocIdMoveFormList");
         for (InvLotLocIdMoveForm invLotLocIdMoveForm :invLotLocIdMoveFormList){
-            invLotLocIdService.clear(invLotLocIdMoveForm.getLocationFrom(), Constant.WAREHOUSE_ID, "pda");
             locationViewSafeController.setIsEmptyPallent(Long.parseLong(invLotLocIdMoveForm.getLocationFrom()));
-            locationViewSafeController.adjLocationIsEmpty(Long.parseLong(invLotLocIdMoveForm.getLocationFrom()));
         }
         return AjaxResult.success();
     }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -26,7 +26,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 登录校验方法
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -40,7 +40,7 @@ public class SysLoginService
 
     @Autowired
     private RedisCache redisCache;
-    
+
     @Autowired
     private ISysUserService userService;
 
@@ -49,7 +49,7 @@ public class SysLoginService
 
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
      * @param code 验证码
@@ -86,15 +86,17 @@ public class SysLoginService
             }
         }
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
+        redisCache.setCacheObject("userName",loginUser.getUsername());
         // 生成token
         return tokenService.createToken(loginUser);
     }
 
     /**
      * 校验验证码
-     * 
+     *
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -28,10 +28,12 @@ import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
 import com.ruoyi.base.mapper.BaseLocationInfoMapper;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.service.IBaseSkuService;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.redis.RedisKey;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.SnowflakeIdWorker;
 import lombok.extern.slf4j.Slf4j;
@@ -78,6 +80,8 @@ public class BusinessServiceImpl implements IBusinessService {
     @Autowired
     private IFlowConfigHeaderService flowConfigHeaderService;
 
+
+
     public static int geniKey(String taskNo) {
         int res = CRC16Util.calcCrc16(ByteUtil.string2byteArray(taskNo));
         if (res == 0) {
@@ -555,6 +559,8 @@ public class BusinessServiceImpl implements IBusinessService {
             }else {
                 wcsTask.setPriority(10L);
             }
+            Object userName = redisCache.getCacheObject("userName");
+            wcsTask.setCreateUser(userName.toString());
             wcsTask.setShopId(Constant.WAREHOUSE_ID.toString());
             wcsTask.setCreateDate(new Date());
             wcsTask.setBusinessType("01");

warewms-ams/src/main/resources/mapper/ams/WcsTaskMapper.xml

@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWcsTaskListVO" parameterType="WcsTask" resultMap="WcsTaskResult">
         select t.task_no, t.business_type,bf.location_no location_from,fz.zone_name area_from,bt.location_no location_to,tz.zone_name area_to,
-        t.state,t.create_date,t.task_type, t.start_time, t.end_time,t.remark
+        t.state,t.create_date,t.task_type, t.start_time, t.end_time,t.remark ,t.create_user
         from wcs_task t
         left join base_location_info bf on t.location_from = bf.id
         left join base_location_info bt on t.location_to = bt.id