手持机

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java

@@ -9,11 +9,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * 仓库管理Controller
@@ -35,6 +37,11 @@ public class BasWarehouseController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(BasWarehouse basWarehouse)
     {
+
+        // 检查当前请求使用的语言包
+        Locale currentLocale = LocaleContextHolder.getLocale();
+        System.out.println("当前请求使用的语言包: " + currentLocale);
+        logger.info("当前请求使用的语言包: " + currentLocale);
         startPage();
         List<BasWarehouse> list = basWarehouseService.selectBasWarehouseList(basWarehouse);
         return getDataTable(list);

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java

@@ -105,6 +105,26 @@ public class InStockin extends BaseEntity
 
     private List<String> typeData;
 
+    private String beginTime;
+
+    private String endTime;
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     public List<String> getTypeData() {
         return typeData;
     }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java

@@ -134,6 +134,26 @@ public class MydoJob extends BaseEntity
     private String createLeftTime;
     private String createRightTime;
 
+    private String beginCreateTime;
+
+    private String endCreateTime;
+
+
+    public String getBeginCreateTime() {
+        return beginCreateTime;
+    }
+
+    public void setBeginCreateTime(String beginCreateTime) {
+        this.beginCreateTime = beginCreateTime;
+    }
+
+    public String getEndCreateTime() {
+        return endCreateTime;
+    }
+
+    public void setEndCreateTime(String endCreateTime) {
+        this.endCreateTime = endCreateTime;
+    }
 
     public String getCreateLeftTime() {
         return createLeftTime;

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java

@@ -2,6 +2,7 @@ package com.ruoyi.out.outStockout.controller;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.out.outStockout.domain.OutStockoutVo;
@@ -9,6 +10,7 @@ import com.ruoyi.out.outStockoutFinish.domain.OutStockoutFinish;
 import com.ruoyi.out.outStockoutFinish.service.IOutStockoutFinishService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +43,7 @@ public class OutStockoutController extends BaseController {
     @PreAuthorize("@ss.hasPermi('out:outStockout:list')")
     @GetMapping("/list")
     public TableDataInfo list(OutStockout outStockout) {
+
         startPage();
         List<OutStockout> list = new ArrayList<>();
         if(Integer.parseInt(outStockout.getStatus())<4){

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java

@@ -93,6 +93,8 @@ public class OutStockout extends BaseEntity
 
     private List<String> typeData;
 
+
+
     public List<String> getTypeData() {
         return typeData;
     }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java

@@ -1,6 +1,6 @@
 package com.ruoyi.receive.stockin.domain;
 
-import com.ruoyi.bas.BasProduct.domain.BasProduct;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -105,6 +105,26 @@ public class ReceiveStockin extends BaseEntity
     private String lotNo;
     private String materialDesc;
 
+    private String beginTime;
+
+    private String endTime;
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     public String getLotNo() {
         return lotNo;
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,8 +1,10 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -53,6 +55,7 @@ public class SysLoginController
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
+
         return ajax;
     }
 
@@ -98,7 +101,9 @@ public class SysLoginController
     @GetMapping("/changeLanguage")
     public AjaxResult changeLanguage(String lang)
     {
-
+// 检查当前请求使用的语言包
+        Locale currentLocale = LocaleContextHolder.getLocale();
+        System.out.println("当前修改请求使用的语言包: " + currentLocale);
         return AjaxResult.success();
     }
 }