手持机

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();
     }
 }

ruoyi-admin/src/main/resources/i18n/messages_hu.properties

@@ -0,0 +1,461 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.delete=对不起，您的账号已被删除
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+login.blocked=很遗憾，访问IP已被列入系统黑名单
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+
+
+#返回信息国际化
+ajax.result.success=操作成功
+ajax.result.fail=操作失败
+table.result.success=查询成功11111
+
+#2wms message
+2wms.result1=作业请求成功
+2wms.result2=没有该作业
+
+#warn message
+warn.message=任务不存在
+warn.message1=任务已开始
+warn.message13=任务未开始
+warn.message2=子任务不存在
+warn.message3=暂不支持的任务类型
+warn.message4=单据不存在
+warn.message5=单据状态未审核
+warn.message6=此用户无权限操作该仓库物料，或物料不存在
+warn.message7=同一托盘不能绑定不同仓库的物料
+warn.message8=新增库存，存在为0的数量
+warn.message9=请选择仓库
+warn.message10=请选择提供绑定数量
+warn.message11=请选择绑定容器
+warn.message12=绑定数量不能大于实际数量
+
+#error message
+error.message1=托盘码不能为空
+error.message2=作业号不能为空
+error.message3=拣选工位不能为空
+error.message4=没有该拣选工位绑定的电子标签
+error.message5=容器码不能为空
+error.message6=起始点位不能为空
+error.message7=目标点位不能为空
+error.message8=物料已存在
+error.message9=没有货位
+error.message10=库存非正常状态
+error.message11=没有该料架
+error.message12=作业类型错误
+error.message13=请选择质检项
+error.message14=只能完成正执行的作业
+error.message15=没有找到该库存
+error.message16=物料不能为空
+error.message17=取消ctu任务失败
+error.message18=仓库不存在
+error.message19=请选择高架库货位
+error.message20=此仓库没有空余货位
+error.message21=单据状态非未执行状态!
+error.message23=单据状态未执行状态!
+error.message22=请选择出口
+error.message24=导入数据为空
+error.message25=此区域没有空托盘库存
+error.message26=此区域没有空托盘库存或此用户没有该区域权限
+error.message27=单据不存在
+error.message28=任务不存在
+error.message29=未质检完成
+error.message30=无质检信息
+error.message31=此起点无料架，请检查
+
+#ViewStockWarning
+search.ViewStockWarning.stockId=Stock ID
+search.ViewStockWarning.cargoSpaceId=Cargo Space ID
+search.ViewStockWarning.stockStatus=Stock Status
+search.ViewStockWarning.productStatus=Product Status
+search.ViewStockWarning.lotNo=Lot Number
+search.ViewStockWarning.inDate=In Date
+search.ViewStockWarning.backDate=Back Date
+search.ViewStockWarning.productGuid=Product GUID
+search.ViewStockWarning.quantity=Quantity
+search.ViewStockWarning.jobId=Job ID
+search.ViewStockWarning.trayCode=Tray Code
+search.ViewStockWarning.outQuantity=Out Quantity
+search.ViewStockWarning.stockinDetailId=Stock In Detail ID
+search.ViewStockWarning.stockinId=Stock In ID
+search.ViewStockWarning.inType=In Type
+search.ViewStockWarning.inClassId=In Class ID
+search.ViewStockWarning.warehouseId=Warehouse ID
+search.ViewStockWarning.stackingId=Stacking ID
+search.ViewStockWarning.spare1=Stock Warning Flag
+search.ViewStockWarning.productId=Product ID
+search.ViewStockWarning.warehouseName=Warehouse Name
+search.ViewStockWarning.address=Address
+search.ViewStockWarning.cDesc=Description
+search.ViewStockWarning.warehouseKind=Warehouse Kind
+search.ViewStockWarning.warehouseType=Warehouse Type
+search.ViewStockWarning.isCurrent=Is Current
+search.ViewStockWarning.price=Price
+search.ViewStockWarning.unit=Unit
+search.ViewStockWarning.spec=Specification
+search.ViewStockWarning.enName=English Name
+search.ViewStockWarning.weight=Weight
+search.ViewStockWarning.longMM=Length MM
+search.ViewStockWarning.wide=Width MM
+search.ViewStockWarning.hight=Height MM
+search.ViewStockWarning.volume=Volume m³
+search.ViewStockWarning.productName=Product Name
+search.ViewStockWarning.cargoSpaceName=Cargo Space Name
+search.ViewStockWarning.roadwayId=Roadway ID
+search.ViewStockWarning.cargoAreaId=Cargo Area ID
+search.ViewStockWarning.theType=Cargo Type
+search.ViewStockWarning.theTypeName=Cargo Type Name
+search.ViewStockWarning.thePlatoon=Row
+search.ViewStockWarning.theColumn=Column
+search.ViewStockWarning.theFloor=Floor
+search.ViewStockWarning.cargoStatus=Cargo Status
+search.ViewStockWarning.locked=Locked
+search.ViewStockWarning.cargoHight=Cargo Height
+search.ViewStockWarning.issDouble=Is Double
+search.ViewStockWarning.groupCodingNo=Group Coding No
+search.ViewStockWarning.groupCoding=Group Coding
+search.ViewStockWarning.cargoSpaceLogo=Cargo Space Logo
+search.ViewStockWarning.thisCargoArea=This Cargo Area
+
+#ViewStockSecure
+search.ViewStockSecure.stockId=Stock ID
+search.ViewStockSecure.cargoSpaceId=Cargo Space ID
+search.ViewStockSecure.stockStatus=Stock Status
+search.ViewStockSecure.productStatus=Product Status
+search.ViewStockSecure.lotNo=Lot Number
+search.ViewStockSecure.inDate=In Date
+search.ViewStockSecure.backDate=Back Date
+search.ViewStockSecure.productGuid=Product GUID
+search.ViewStockSecure.quantity=Quantity
+search.ViewStockSecure.jobId=Job ID
+search.ViewStockSecure.trayCode=Tray Code
+search.ViewStockSecure.outQuantity=Out Quantity
+search.ViewStockSecure.stockinDetailId=Stock In Detail ID
+search.ViewStockSecure.stockinId=Stock In ID
+search.ViewStockSecure.inType=In Type
+search.ViewStockSecure.inClassId=In Class ID
+search.ViewStockSecure.warehouseId=Warehouse ID
+search.ViewStockSecure.stackingId=Stack Type ID
+search.ViewStockSecure.spare1=Stock Warning Flag
+search.ViewStockSecure.productId=Product ID
+search.ViewStockSecure.warehouseName=Warehouse Name
+search.ViewStockSecure.address=Address
+search.ViewStockSecure.cDesc=Description
+search.ViewStockSecure.warehouseKind=Warehouse Kind
+search.ViewStockSecure.warehouseType=Warehouse Type
+search.ViewStockSecure.isCurrent=Is Current
+search.ViewStockSecure.price=Price
+search.ViewStockSecure.unit=Unit
+search.ViewStockSecure.spec=Specification
+search.ViewStockSecure.enName=English Name
+search.ViewStockSecure.weight=Weight
+search.ViewStockSecure.longMM=Length MM
+search.ViewStockSecure.wide=Width MM
+search.ViewStockSecure.hight=Height MM
+search.ViewStockSecure.volume=Volume m³
+search.ViewStockSecure.productName=Product Name
+search.ViewStockSecure.cargoSpaceName=Cargo Space Name
+search.ViewStockSecure.roadwayId=Roadway ID
+search.ViewStockSecure.cargoAreaId=Cargo Area ID
+search.ViewStockSecure.theType=Type
+search.ViewStockSecure.theTypeName=Type Name
+search.ViewStockSecure.thePlatoon=Platoon
+search.ViewStockSecure.theColumn=Column
+search.ViewStockSecure.theFloor=Floor
+search.ViewStockSecure.cargoStatus=Cargo Status
+search.ViewStockSecure.locked=Locked
+search.ViewStockSecure.cargoHight=Cargo Height
+search.ViewStockSecure.issDouble=Is Double
+search.ViewStockSecure.groupCodingNo=Group Coding No
+search.ViewStockSecure.groupCoding=Group Coding
+search.ViewStockSecure.cargoSpaceLogo=Cargo Space Logo
+search.ViewStockSecure.thisCargoArea=This Cargo Area
+
+#ViewFlatWarehouseOutFlow
+search.ViewFlatWarehouseOutFlow.inOrOut=In/Out Type
+search.ViewFlatWarehouseOutFlow.inOrOutSotckId=In/Out Main Document ID
+search.ViewFlatWarehouseOutFlow.inOrOutSotckDetailId=In/Out Sub Document ID
+search.ViewFlatWarehouseOutFlow.productGuid=Product GUID
+search.ViewFlatWarehouseOutFlow.productId=Product ID
+search.ViewFlatWarehouseOutFlow.quantity=In/Out Quantity
+search.ViewFlatWarehouseOutFlow.createMan=Creator
+search.ViewFlatWarehouseOutFlow.warehouseId=Warehouse ID
+search.ViewFlatWarehouseOutFlow.warehouseName=Warehouse Name
+search.ViewFlatWarehouseOutFlow.address=Address
+search.ViewFlatWarehouseOutFlow.cDesc=Description
+search.ViewFlatWarehouseOutFlow.warehouseKind=Warehouse Kind
+search.ViewFlatWarehouseOutFlow.warehouseType=Warehouse Type
+search.ViewFlatWarehouseOutFlow.isCurrent=Is Current
+search.ViewFlatWarehouseOutFlow.productName=Product Name
+search.ViewFlatWarehouseOutFlow.spec=Specification
+search.ViewFlatWarehouseOutFlow.unit=Unit
+search.ViewFlatWarehouseOutFlow.price=Price
+search.ViewFlatWarehouseOutFlow.spare1=English Name
+search.ViewFlatWarehouseOutFlow.spare2=Net Weight
+search.ViewFlatWarehouseOutFlow.spare5=Length MM
+search.ViewFlatWarehouseOutFlow.spare6=Width MM
+search.ViewFlatWarehouseOutFlow.spare7=Height MM
+search.ViewFlatWarehouseOutFlow.spare8=Volume m³
+search.ViewFlatWarehouseOutFlow.remark=Remark
+
+# ViewFlatWarehouseInFlow
+search.ViewFlatWarehouseInFlow.inOrOut=In/Out Type
+search.ViewFlatWarehouseInFlow.inOrOutSotckId=In/Out Main Document ID
+search.ViewFlatWarehouseInFlow.inOrOutSotckDetailId=In/Out Sub Document ID
+search.ViewFlatWarehouseInFlow.productGuid=Product GUID
+search.ViewFlatWarehouseInFlow.productId=Product ID
+search.ViewFlatWarehouseInFlow.quantity=Quantity
+search.ViewFlatWarehouseInFlow.createMan=Creator
+search.ViewFlatWarehouseInFlow.warehouseId=Warehouse ID
+search.ViewFlatWarehouseInFlow.warehouseName=Warehouse Name
+search.ViewFlatWarehouseInFlow.address=Warehouse Address
+search.ViewFlatWarehouseInFlow.cDesc=Warehouse Description
+search.ViewFlatWarehouseInFlow.warehouseKind=Warehouse Level
+search.ViewFlatWarehouseInFlow.warehouseType=Warehouse Type
+search.ViewFlatWarehouseInFlow.isCurrent=Is Available
+search.ViewFlatWarehouseInFlow.productName=Product Name
+search.ViewFlatWarehouseInFlow.spec=Specification
+search.ViewFlatWarehouseInFlow.unit=Unit
+search.ViewFlatWarehouseInFlow.price=Price
+search.ViewFlatWarehouseInFlow.spare1=English Name
+search.ViewFlatWarehouseInFlow.spare2=Net Weight per Unit
+search.ViewFlatWarehouseInFlow.spare5=Length MM
+search.ViewFlatWarehouseInFlow.spare6=Width MM
+search.ViewFlatWarehouseInFlow.spare7=Height MM
+search.ViewFlatWarehouseInFlow.spare8=Volume m³
+search.ViewFlatWarehouseInFlow.remark=Remark
+
+# ViewInJobFlow
+search.ViewInJobFlow.jobId=Job ID
+search.ViewInJobFlow.jobDetailId=Job Detail ID
+search.ViewInJobFlow.status=Status
+search.ViewInJobFlow.taskNo=Task Number
+search.ViewInJobFlow.trayCode=Tray Code
+search.ViewInJobFlow.roadwayId=Roadway ID
+search.ViewInJobFlow.cargoSpaceId=Cargo Space ID
+search.ViewInJobFlow.cargoSpaceName=Cargo Space Name
+search.ViewInJobFlow.thePlatoon=Row
+search.ViewInJobFlow.theColumn=Column
+search.ViewInJobFlow.theFloor=Floor
+search.ViewInJobFlow.priority=Priority
+search.ViewInJobFlow.executionPhase=Execution Phase
+search.ViewInJobFlow.inOrOut=Job Type
+search.ViewInJobFlow.entranceId=Entrance ID
+search.ViewInJobFlow.productId=Product ID
+search.ViewInJobFlow.lotNo=Lot Number
+search.ViewInJobFlow.stackingId=Stacking ID
+search.ViewInJobFlow.stockStatus=Stock Status
+search.ViewInJobFlow.inQuantity=In Quantity
+search.ViewInJobFlow.inOrOutId=Document ID
+search.ViewInJobFlow.inOrOutDId=Sub Document ID
+search.ViewInJobFlow.startTime=Start Time
+search.ViewInJobFlow.finishTime=Finish Time
+search.ViewInJobFlow.warehouseId=Warehouse ID
+search.ViewInJobFlow.productName=Product Name
+search.ViewInJobFlow.spec=Specification
+search.ViewInJobFlow.unit=Unit
+search.ViewInJobFlow.price=Price
+search.ViewInJobFlow.spare1=English Name
+search.ViewInJobFlow.spare2=Net Weight per Unit
+search.ViewInJobFlow.spare5=Length MM
+search.ViewInJobFlow.spare6=Width MM
+search.ViewInJobFlow.spare7=Height MM
+search.ViewInJobFlow.spare8=Volume m³
+search.ViewInJobFlow.remark=Remark
+
+#ViewOutJobFlow
+search.ViewOutJobFlow.jobId=Job ID
+search.ViewOutJobFlow.jobDetailId=Job Detail ID
+search.ViewOutJobFlow.status=Status
+search.ViewOutJobFlow.taskNo=Task Number
+search.ViewOutJobFlow.trayCode=Tray Code
+search.ViewOutJobFlow.roadwayId=Roadway ID
+search.ViewOutJobFlow.cargoSpaceId=Cargo Space ID
+search.ViewOutJobFlow.cargoSpaceName=Cargo Space Name
+search.ViewOutJobFlow.thePlatoon=Row
+search.ViewOutJobFlow.theColumn=Column
+search.ViewOutJobFlow.theFloor=Floor
+search.ViewOutJobFlow.priority=Priority
+search.ViewOutJobFlow.executionPhase=Execution Phase
+search.ViewOutJobFlow.inOrOut=Job Type
+search.ViewOutJobFlow.exitId=Exit ID
+search.ViewOutJobFlow.productId=Product ID
+search.ViewOutJobFlow.lotNo=Lot Number
+search.ViewOutJobFlow.stackingId=Stacking ID
+search.ViewOutJobFlow.stockStatus=Stock Status
+search.ViewOutJobFlow.outQuantity=Out Quantity
+search.ViewOutJobFlow.giveNum=Return Quantity
+search.ViewOutJobFlow.inOrOutId=Document ID
+search.ViewOutJobFlow.inOrOutDId=Sub Document ID
+search.ViewOutJobFlow.startTime=Start Time
+search.ViewOutJobFlow.finishTime=Finish Time
+search.ViewOutJobFlow.warehouseId=Warehouse ID
+search.ViewOutJobFlow.productName=Product Name
+search.ViewOutJobFlow.spec=Specification
+search.ViewOutJobFlow.unit=Unit
+search.ViewOutJobFlow.customerName=Customer Name
+search.ViewOutJobFlow.price=Price
+search.ViewOutJobFlow.spare1=English Name
+search.ViewOutJobFlow.spare2=Net Weight per Unit
+search.ViewOutJobFlow.spare5=Length MM
+search.ViewOutJobFlow.spare6=Width MM
+search.ViewOutJobFlow.spare7=Height MM
+search.ViewOutJobFlow.spare8=Volume m³
+search.ViewOutJobFlow.remark=Remark
+
+# ViewStockoutHistory
+search.ViewStockoutHistory.stockoutId=Stockout ID
+search.ViewStockoutHistory.warehouseId=Warehouse ID
+search.ViewStockoutHistory.outType=Out Type
+search.ViewStockoutHistory.createDate=Create Date
+search.ViewStockoutHistory.createManId=Creator ID
+search.ViewStockoutHistory.status=Status
+search.ViewStockoutHistory.stockoutSource=Stockout Source
+search.ViewStockoutHistory.exitId=Exit Type
+search.ViewStockoutHistory.stockoutDetailId=Stockout Detail ID
+search.ViewStockoutHistory.productId=Product ID
+search.ViewStockoutHistory.productName=Product Name
+search.ViewStockoutHistory.lotNo=Lot Number
+search.ViewStockoutHistory.quantity=Out Quantity
+search.ViewStockoutHistory.allotQuantity=Allot Quantity
+search.ViewStockoutHistory.assignNum=Assign Number
+search.ViewStockoutHistory.erpStockoutId=ERP Stockout ID
+search.ViewStockoutHistory.entryid=Customer Code
+search.ViewStockoutHistory.customerName=Customer Name
+search.ViewStockoutHistory.spec=Specification
+search.ViewStockoutHistory.unit=Unit
+search.ViewStockoutHistory.price=Price
+search.ViewStockoutHistory.spare1=English Name
+search.ViewStockoutHistory.spare2=Net Weight per Unit
+search.ViewStockoutHistory.spare5=Length MM
+search.ViewStockoutHistory.spare6=Width MM
+search.ViewStockoutHistory.spare7=Height MM
+search.ViewStockoutHistory.spare8=Volume m³
+search.ViewStockoutHistory.remark=Remark
+
+# ViewStockinHistory
+search.ViewStockinHistory.stockinGuid=Stockin GUID
+search.ViewStockinHistory.stockinId=Stockin ID
+search.ViewStockinHistory.inType=In Type
+search.ViewStockinHistory.createDate=Create Date
+search.ViewStockinHistory.createManId=Creator
+search.ViewStockinHistory.status=Status
+search.ViewStockinHistory.warehouseId=Warehouse ID
+search.ViewStockinHistory.finishDate=Finish Date
+search.ViewStockinHistory.erpBill=ERP Bill
+search.ViewStockinHistory.stockSource=Stock Source
+search.ViewStockinHistory.departmentNo=Department No
+search.ViewStockinHistory.classNo=Class No
+search.ViewStockinHistory.supplierNo=Supplier No
+search.ViewStockinHistory.supplierName=Supplier Name
+search.ViewStockinHistory.simpleName=Simple Name
+search.ViewStockinHistory.contactName=Contact Name
+search.ViewStockinHistory.contactNumber=Contact Number
+search.ViewStockinHistory.address=Supplier Address
+search.ViewStockinHistory.stockinDetailId=Stockin Detail ID
+search.ViewStockinHistory.lotNo=Lot Number
+search.ViewStockinHistory.quantity=Planned Quantity
+search.ViewStockinHistory.quantityX=Planned Boxes
+search.ViewStockinHistory.quantityJ=Planned Pieces
+search.ViewStockinHistory.assignNum=Actual Quantity
+search.ViewStockinHistory.assignNumX=Actual Boxes
+search.ViewStockinHistory.assignNumJ=Actual Pieces
+search.ViewStockinHistory.scanNum=Scan Quantity
+search.ViewStockinHistory.scanNumX=Scan Boxes
+search.ViewStockinHistory.scanNumJ=Scan Pieces
+search.ViewStockinHistory.printDate=In Date
+search.ViewStockinHistory.stockStatus=Stock Status
+search.ViewStockinHistory.price=Price
+search.ViewStockinHistory.productId=Product ID
+search.ViewStockinHistory.productName=Product Name
+search.ViewStockinHistory.unit=Unit
+search.ViewStockinHistory.spec=Specification
+search.ViewStockinHistory.spare1=English Name
+search.ViewStockinHistory.spare2=Net Weight per Unit
+search.ViewStockinHistory.spare5=Length MM
+search.ViewStockinHistory.spare6=Width MM
+search.ViewStockinHistory.spare7=Height MM
+search.ViewStockinHistory.spare8=Volume m³
+search.ViewStockinHistory.remark=Remark
+
+# StockSummary
+search.StockSummary.productId=Product ID
+search.StockSummary.productName=Product Name
+search.StockSummary.spec=Specification
+search.StockSummary.unit=Unit
+search.StockSummary.lotNo=Lot Number
+search.StockSummary.warehouseName=Warehouse
+search.StockSummary.quantity=Stock Quantity
+search.StockSummary.price=Price
+search.StockSummary.spare1=English Name
+search.StockSummary.spare2=Net Weight per Unit
+search.StockSummary.spare5=Length MM
+search.StockSummary.spare6=Width MM
+search.StockSummary.spare7=Height MM
+search.StockSummary.spare8=Volume m³
+search.StockSummary.remark=Remark
+search.StockSummary.cargoSpaceName=Cargo Space Name
+
+# ViewStockDetail
+search.ViewStockDetail.onlyIdentity=ID
+search.ViewStockDetail.stockId=Stock ID
+search.ViewStockDetail.cargoSpaceId=Cargo Space ID
+search.ViewStockDetail.trayCode=Tray Code
+search.ViewStockDetail.quantity=Quantity
+search.ViewStockDetail.jobId=Job ID
+search.ViewStockDetail.lotNo=Lot Number
+search.ViewStockDetail.stockinDetailId=Stock In Detail ID
+search.ViewStockDetail.inDate=In Date
+search.ViewStockDetail.warehouseId=Warehouse
+search.ViewStockDetail.stackingId=Stacking ID
+search.ViewStockDetail.cargoSpaceName=Cargo Space Name
+search.ViewStockDetail.roadwayId=Roadway ID
+search.ViewStockDetail.cargoSpaceStatus=Cargo Space Status
+search.ViewStockDetail.locked=Locked
+search.ViewStockDetail.productId=Product ID
+search.ViewStockDetail.productName=Product Name
+search.ViewStockDetail.spec=Specification
+search.ViewStockDetail.unit=Unit
+search.ViewStockDetail.price=Price
+search.ViewStockDetail.spare1=English Name
+search.ViewStockDetail.spare2=Net Weight per Unit
+search.ViewStockDetail.spare5=Length MM
+search.ViewStockDetail.spare6=Width MM
+search.ViewStockDetail.spare7=Height MM
+search.ViewStockDetail.spare8=Volume m³
+search.ViewStockDetail.remark=Remark
+search.ViewStockDetail.stockStatus=Stock Status
+search.ViewStockDetail.productStatus=Product Status

ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml

@@ -115,7 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and is2.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date = #{createDate}</if>
+            <if test="beginTime != null  and beginTime != ''"> and is2.create_date &gt;= #{beginTime}</if>
+            <if test="endTime != null  and endTime != ''"> and is2.create_date &lt;= #{endTime}</if>
             <if test="createManId != null  and createManId != ''"> and is2.create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and is2.status = #{status}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
@@ -126,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerNo != null  and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
             <if test="classNo != null  and classNo != ''"> and is2.class_no = #{classNo}</if>
             <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName},'%')</if>
             <if test="spare1 != null  and spare1 != ''"> and is2.spare1 = #{spare1}</if>
             <if test="spare2 != null  and spare2 != ''"> and is2.spare2 = #{spare2}</if>
             <if test="spare3 != null  and spare3 != ''"> and is2.spare3 = #{spare3}</if>

ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml

@@ -66,7 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and is2.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date = #{createDate}</if>
+            <if test="beginTime != null  and beginTime != ''"> and is2.create_date &gt;= #{beginTime}</if>
+            <if test="endTime != null  and endTime != ''"> and is2.create_date &lt;= #{endTime}</if>
             <if test="createManId != null  and createManId != ''"> and is2.create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and is2.status = #{status}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerNo != null  and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
             <if test="classNo != null  and classNo != ''"> and is2.class_no = #{classNo}</if>
             <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName},'%')</if>
             <if test="spare1 != null  and spare1 != ''"> and is2.spare1 = #{spare1}</if>
             <if test="spare2 != null  and spare2 != ''"> and is2.spare2 = #{spare2}</if>
             <if test="spare4 != null  and spare4 != ''"> and is2.spare4 = #{spare4}</if>

ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml

@@ -123,6 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priority != null "> and mj.priority = #{priority}</if>
             <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
             <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
+            <if test="beginCreateTime != null  and beginCreateTime != ''"> and mj.create_time &gt;= #{beginCreateTime}</if>
+            <if test="endCreateTime != null  and endCreateTime != ''"> and mj.create_time &lt;= #{endCreateTime}</if>
             <if test="startTime != null  and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
             <if test="finishTime != null  and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
             <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id = #{entranceId}</if>

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -77,6 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="priority != null "> and mj.priority = #{priority}</if>
             <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase = #{executionPhase}</if>
             <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out = #{inOrOut}</if>
+            <if test="beginCreateTime != null  and beginCreateTime != ''"> and mj.create_time &gt;= #{beginCreateTime}</if>
+            <if test="endCreateTime != null  and endCreateTime != ''"> and mj.create_time &lt;= #{endCreateTime}</if>
             <if test="startTime != null  and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
             <if test="finishTime != null  and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
             <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat('%',#{entranceId},'%')</if>

ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>
             <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id = #{stockoutId}</if>
             <if test="outType != null  and outType != ''"> and o.out_type = #{outType}</if>
+
             <if test="startDate != null  and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
             <if test="finishDate != null  and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
             <if test="departmentNo != null  and departmentNo != ''"> and o.department_no = #{departmentNo}</if>

ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml

@@ -116,7 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and rs.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date = #{createDate}</if>
+            <if test="beginTime != null  and beginTime != ''"> and rs.create_date &gt;= #{beginTime}</if>
+            <if test="endTime != null  and endTime != ''"> and rs.create_date &lt;= #{endTime}</if>
             <if test="createManId != null  and createManId != ''"> and rs.create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and rs.status = #{status}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>

ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml

@@ -68,7 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
             <if test="inType != null  and inType != ''"> and rs.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and rs.create_date = #{createDate}</if>
+
+            <if test="beginTime != null  and beginTime != ''"> and rs.create_date &gt;= #{beginTime}</if>
+            <if test="endTime != null  and endTime != ''"> and rs.create_date &lt;= #{endTime}</if>
             <if test="createManId != null  and createManId != ''"> and rs.create_man_id = #{createManId}</if>
             <if test="status != null  and status != ''"> and rs.status = #{status}</if>
             <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>