解决永湖线上bug-解绑以及出入库重新绑定不会重置托盘

ruoyi-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: prod
   # 文件上传
   servlet:
     multipart:
@@ -107,7 +107,4 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 
-# 是否开启服务
-#testtag:
-#  autosend: true
-#  aciservice: true
+iue

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -286,9 +286,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
     @Transactional
     @Override
     public synchronized AjaxResult doStock(StockForm stockForm) {
-        //LoginUser loginUser = SecurityUtils.getLoginUser();
-        LoginUser loginUser = new LoginUser();
-        loginUser.setUser(new SysUser());
+        LoginUser loginUser = SecurityUtils.getLoginUser();
         Long STAGE01 = Constant.LOC_STAGE_CACHE;
         WmsDocOrderHeader wmsDocOrderHeader;
 
@@ -547,7 +545,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
 
         WmsBoxInfo wmsBoxInfo = getWmsBoxInfo(palletNo);
         Assert.isTrue(ObjectUtil.isNotNull(wmsBoxInfo) && StringUtils.isNotBlank(wmsBoxInfo.getBoxNo()), "未找到当前可用的托盘");
-        Assert.isTrue(StringUtils.equals(Constants.NO, wmsBoxInfo.getIsFull()), "当前托盘已满托");
+        //Assert.isTrue(StringUtils.equals(Constants.NO, wmsBoxInfo.getIsFull()), "当前托盘已满托");
 
         BaseLocationInfo locationTo = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(paForm.getLocationTo(), Constant.WAREHOUSE_ID);
         // 校验上架库位必须为入库缓存位或者线边库位
@@ -992,7 +990,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
     private WmsBoxInfo updateIfExist(WmsBoxInfo wmsBoxInfo, String currentFullTag, String username) {
         if(ObjectUtil.isNull(wmsBoxInfo) || StringUtils.isBlank(wmsBoxInfo.getBoxNo())) return wmsBoxInfo;
 
-        Assert.isTrue(StringUtils.equals(Constants.NO, wmsBoxInfo.getIsFull()), "当前托盘已满托");
+        //Assert.isTrue(StringUtils.equals(Constants.NO, wmsBoxInfo.getIsFull()), "当前托盘已满托");
         wmsBoxInfo.setBoxState(1);//启用状态
         wmsBoxInfo.setIsFull(currentFullTag);
         wmsBoxInfo.setIsEmpty("N");