已完成已作废的作业不能再次操作,主子表刷新问题,导出字典国际化

This commit is contained in:
猫猫guowen
2025-08-21 11:22:13 +08:00
parent a6c83092c7
commit ae9b0f3660
30 changed files with 1511 additions and 591 deletions

View File

@@ -459,3 +459,352 @@ search.ViewStockDetail.spare8=Volume m³
search.ViewStockDetail.remark=Remark
search.ViewStockDetail.stockStatus=Stock Status
search.ViewStockDetail.productStatus=Product Status
# BasStock Export Fields
stock.BasStock.stockId=Stock ID
stock.BasStock.cargoSpaceId=Cargo Space ID
stock.BasStock.cargoSpaceName=Cargo Space Name
stock.BasStock.stockStatus=Stock Status
stock.BasStock.productStatus=Product Status
stock.BasStock.lotNo=Lot Number
stock.BasStock.inDate=In Date
stock.BasStock.backDate=Back Date
stock.BasStock.productGuid=Product GUID
stock.BasStock.quantity=Quantity
stock.BasStock.jobId=Job ID
stock.BasStock.trayCode=Tray Code
stock.BasStock.outQuantity=Out Quantity
stock.BasStock.stockinDetailId=Stock In Detail ID
stock.BasStock.stockinId=Stock In ID
stock.BasStock.inType=In Type
stock.BasStock.inClassId=In Class ID
stock.BasStock.warehouseId=Warehouse ID
stock.BasStock.warehouseName=Warehouse Name
stock.BasStock.stackingId=Stacking ID
stock.BasStock.spare1=Spare Field 1
stock.BasStock.spare2=Spare Field 2
stock.BasStock.spare3=Spare Field 3
stock.BasStock.spare4=Spare Field 4
stock.BasStock.spare5=Spare Field 5
stock.BasStock.spare6=Spare Field 6
stock.BasStock.cargoSpaceStatus=Cargo Space Lock Status
stock.BasStock.cargoSpaceStockStatus=Cargo Space Stock Status
stock.BasStock.productId=Product ID
stock.BasStock.materialDesc=Material Description
stock.BasStock.englishDesc=English Description
stock.BasStock.netWeight=Net Weight
stock.BasStock.length=Length
stock.BasStock.width=Width
stock.BasStock.height=Height
stock.BasStock.volume=Volume
# BasStockFreezeRecord Export Fields
stock.Freeze.stockId=Stock ID
stock.Freeze.cargoSpaceId=Cargo Space ID
stock.Freeze.cargoSpaceName=Cargo Space Name
stock.Freeze.trayCode=Tray Code
stock.Freeze.productId=Product ID
stock.Freeze.productName=Product Name
stock.Freeze.printDate=Production Date
stock.Freeze.lotNo=Lot Number
stock.Freeze.oldStatus=Initial Status
stock.Freeze.currStatus=Current Status
stock.Freeze.method=Operation
stock.Freeze.warehouseId=Warehouse
stock.Freeze.stockDetailId=Stock Detail ID
stock.Freeze.operatingTarget=Operating Target
stock.Freeze.barCodeOldQuantity=Barcode Quantity (Old)
stock.Freeze.barCodeQuantity=Barcode Quantity (New)
stock.Freeze.productGuid=Product GUID
# BasStockMaintainRecord Export Fields
stock.Maintain.stockId=Stock ID
stock.Maintain.cargoSpaceId=Cargo Space ID
stock.Maintain.cargoSpaceName=Cargo Space Name
stock.Maintain.trayCode=Tray Code
stock.Maintain.productId=Product ID
stock.Maintain.productName=Product Name
stock.Maintain.printDate=Production Date
stock.Maintain.lotNo=Lot Number
stock.Maintain.oldQuantity=Initial Quantity
stock.Maintain.quantity=Quantity After Operation
stock.Maintain.method=Operation
stock.Maintain.warehouseId=Warehouse
stock.Maintain.stockDetailId=Stock Detail ID
stock.Maintain.operatingTarget=Operating Target
stock.Maintain.barCodeOldQuantity=Barcode Quantity (Old)
stock.Maintain.barCodeQuantity=Barcode Quantity (New)
stock.Maintain.productGuid=Product GUID
# BasSupplier Export Fields
bas.Supplier.supplierNo=Supplier Number
bas.Supplier.supplierGroupNo=Supplier Group Number
bas.Supplier.supplierName=Supplier Name
bas.Supplier.simpleName=Short Name
bas.Supplier.useable=Available
bas.Supplier.supplierArae=Regional Classification
bas.Supplier.taxpayerRegistrationNumber=Taxpayer Registration Number
bas.Supplier.country=Country
bas.Supplier.timeZone=Time Zone
bas.Supplier.dataFormat=Data Format
bas.Supplier.receivingCountry=Receiving Country
bas.Supplier.taxCategory=Tax Category
bas.Supplier.legalPerson=Legal Person
bas.Supplier.registeredCapital=Registered Capital
bas.Supplier.address=Company Address
bas.Supplier.contactName=Contact Name
bas.Supplier.contactNumber=Contact Number
# BasCustomer Export Fields
bas.Customer.customerNo=Customer Number
bas.Customer.customerGroupNo=Customer Group Number
bas.Customer.customerName=Customer Name
bas.Customer.simpleName=Customer Short Name
bas.Customer.useable=Available
bas.Customer.businessDepartment=Business Department
bas.Customer.salesman=Salesman
bas.Customer.mnemonicCode=Mnemonic Code
bas.Customer.type=Customer Type
bas.Customer.taxpayerRegistrationNumber=Taxpayer Registration Number
bas.Customer.organization=Financial Organization
bas.Customer.supCustomer=Superior Customer
bas.Customer.retailInvestor=Retail Investor
bas.Customer.country=Country/Region
bas.Customer.timeZone=Time Zone
bas.Customer.dataFormat=Data Format
bas.Customer.contactName=Contact Name
bas.Customer.shipment=Shipping Country
bas.Customer.taxCategory=Tax Category
# BasProduct Export Fields
bas.Product.productId=Product ID
bas.Product.parentId=Parent Node ID
bas.Product.price=Price
bas.Product.cargoNo=Brand
bas.Product.unit=Unit
bas.Product.spec=Specification
bas.Product.spare1=Spare Field 1
bas.Product.spare2=Spare Field 2
bas.Product.spare3=Spare Field 3
bas.Product.spare4=Spare Field 4
bas.Product.spare5=Spare Field 5
bas.Product.spare6=Spare Field 6
bas.Product.spare7=Spare Field 7
bas.Product.spare8=Spare Field 8
bas.Product.spare9=Spare Field 9
bas.Product.productName=Product Name
# BasProductPort Export Fields
bas.ProductPort.portName=Port Name
bas.ProductPort.portType=Port Type
bas.ProductPort.portDesc=Port Description
bas.ProductPort.createMan=Creator
# BasContainer Export Fields
bas.Container.containerId=Container ID
bas.Container.portName=Port Name
bas.Container.status=Container Status
bas.Container.productTypeQuantity=Product Type Quantity
bas.Container.capacity=Capacity
bas.Container.operationMan=Operator
# BasTraycodeFormat Export Fields
bas.TraycodeFormat.barcodeFormat=Barcode Prefix
bas.TraycodeFormat.serialRule=Serial Rule
bas.TraycodeFormat.serialExample=Barcode Example
bas.TraycodeFormat.remarks=Description
bas.TraycodeFormat.minNum=Minimum Serial Number
bas.TraycodeFormat.maxNum=Maximum Serial Number
bas.TraycodeFormat.spare1=Spare Field 1
bas.TraycodeFormat.spare2=Spare Field 2
bas.TraycodeFormat.spare3=Spare Field 3
# BasTraycode Export Fields
bas.Traycode.id=ID
bas.Traycode.formatId=Format ID
bas.Traycode.trayCode=Tray Code
bas.Traycode.spare1=Spare Field 1
bas.Traycode.spare2=Spare Field 2
bas.Traycode.spare3=Spare Field 3
# BasWarehouse Export Fields
bas.Warehouse.warehouseId=Warehouse ID
bas.Warehouse.warehouseNo=Warehouse Number
bas.Warehouse.projectNo=Project Number
bas.Warehouse.warehouseName=Warehouse Name
bas.Warehouse.address=Warehouse Address
bas.Warehouse.cDesc=Warehouse Description
bas.Warehouse.warehouseKind=Warehouse Level
bas.Warehouse.warehouseType=Warehouse Type
bas.Warehouse.isCurrent=Is Available
# BasCargoSpace Export Fields
bas.CargoSpace.warehouseId=Warehouse ID
bas.CargoSpace.roadwayId=Roadway ID
bas.CargoSpace.cargoAreaId=Cargo Area ID
bas.CargoSpace.theType=Cargo Type
bas.CargoSpace.theTypeName=Cargo Type Name
bas.CargoSpace.cargoSpaceName=Cargo Space Name
bas.CargoSpace.thePlatoon=Row
bas.CargoSpace.theColumn=Column
bas.CargoSpace.theFloor=Floor
bas.CargoSpace.status=Cargo Status
bas.CargoSpace.locked=Locked
bas.CargoSpace.trayCode=Tray Code
bas.CargoSpace.cargoHight=Cargo Height
bas.CargoSpace.issDouble=Is Double
bas.CargoSpace.groupCodingNo=Group Coding No
bas.CargoSpace.groupCoding=Group Coding
bas.CargoSpace.cargoSpaceLogo=Cargo Space Logo
bas.CargoSpace.thisCargoArea=This Cargo Area
#字典
dict.is_available.n=否
dict.is_available.y=是
dict.sys_user_sex.a1=男
dict.sys_user_sex.a2=女
dict.sys_user_sex.a3=未知
dict.sys_show_hide.a1=显示
dict.sys_show_hide.a2=隐藏
dict.sys_normal_disable.a1=正常
dict.sys_normal_disable.a2=停用
dict.sys_job_status.a1=正常
dict.sys_job_status.a2=暂停
dict.sys_job_group.a1=默认
dict.sys_job_group.a2=系统
dict.sys_yes_no.a1=是
dict.sys_yes_no.a2=否
dict.sys_notice_type.a1=通知
dict.sys_notice_type.a2=公告
dict.sys_notice_status.a1=正常
dict.sys_notice_status.a2=关闭
dict.sys_oper_type.a1=新增
dict.sys_oper_type.a2=修改
dict.sys_oper_type.a3=删除
dict.sys_oper_type.a4=授权
dict.sys_oper_type.a5=导出
dict.sys_oper_type.a6=导入
dict.sys_oper_type.a7=强退
dict.sys_oper_type.a8=生成代码
dict.sys_oper_type.a9=清空数据
dict.sys_oper_type.a10=其他
dict.sys_common_status.a1=成功
dict.sys_common_status.a2=失败
dict.in_bill_type.a1=自建单据
dict.in_bill_status.a1=未执行
dict.in_bill_status.a2=审核中
dict.in_bill_status.a3=正执行
dict.in_bill_status.a4=已完成
dict.in_bill_status.a5=已作废
dict.out_bill_type.a1=拣选出库
dict.out_bill_type.a2=退货单据
dict.out_bill_status.a1=待执行
dict.out_bill_status.a2=已审核
dict.out_bill_status.a3=正执行
dict.out_bill_status.a4=已完成
dict.out_bill_status.a5=已作废
dict.in_job_type.a1=空料箱入库
dict.in_job_type.a2=CTU物资入库
dict.in_job_type.a3=高架库物资入库
dict.in_job_type.a4=托盘垛入库
dict.mydo_job_status.a1=未执行
dict.mydo_job_status.a2=待执行
dict.mydo_job_status.a3=正执行
dict.mydo_job_status.a4=已完成
dict.mydo_job_status.a5=已作废
dict.execution_phase_type.a1=输送线
dict.execution_phase_type.a2=入库口
dict.execution_phase_type.a3=CTU
dict.execution_phase_type.a4=出库口
dict.on_line_type.a1=类型1
dict.on_line_type.a2=类型2
dict.out_job_type.a1=空料箱出库
dict.out_job_type.a2=空托盘出库
dict.out_job_type.a3=料箱出库
dict.out_job_type.a4=托盘出库
dict.stock_status.a1=正常
dict.stock_status.a2=冻结
dict.product_status.a1=正常
dict.product_status.a2=盘点待审批
dict.product_status.a3=异常
dict.stock_maintain_method.a1=新增
dict.stock_maintain_method.a2=修改
dict.stock_maintain_method.a3=删除
dict.receive_bill_status.a1=未质检
dict.receive_bill_status.a2=质检完成
dict.check_stock_type.a1=物料盘点
dict.check_stock_type.a2=货位盘点
dict.check_bill_status.a1=未执行
dict.check_bill_status.a2=审核中
dict.check_bill_status.a3=正执行
dict.check_bill_status.a4=已完成
dict.check_bill_status.a5=已作废
dict.product_port_rel_status.a1=是
dict.product_port_rel_status.a2=否
dict.check_in_job_type.a1=盘点料箱入库
dict.check_in_job_type.a2=盘点托盘入库
dict.check_out_job_type.a1=盘点料箱出库
dict.check_out_job_type.a2=盘点托盘出库
dict.cargo_space_status.a1=空
dict.cargo_space_status.a2=满
dict.cargo_space_status.a3=入库分配
dict.cargo_space_status.a4=出库分配
dict.cargo_space_status.a5=入库盘点分配
dict.cargo_space_status.a6=出库盘点分配
dict.warehouse_port_type.a1=入口
dict.warehouse_port_type.a2=出口
dict.port_type.a1=缓存点位
dict.port_type.a2=拣选工位
dict.port_type.a3=拣选放货点位
dict.port_type.a4=集货缓存点位
dict.port_type.a5=线边点位
dict.port_type.a6=台位点位
dict.cargo_space_lock_status.a1=锁定
dict.cargo_space_lock_status.a2=解锁
dict.warehouse_type.a1=高架
dict.warehouse_type.a2=CTU库
dict.warehouse_type.a3=平库
dict.record_type.a1=修改
dict.record_type.a2=新增
dict.record_type.a3=删除
dict.audit_diff_status.a1=未审核
dict.audit_diff_status.a2=审查通过
dict.audit_diff_status.a3=审核不通过
dict.agv_status.a1=无任务
dict.agv_status.a2=任务中

View File

@@ -457,3 +457,353 @@ search.ViewStockDetail.spare8=体积m³
search.ViewStockDetail.remark=备注
search.ViewStockDetail.stockStatus=库存状态
search.ViewStockDetail.productStatus=物料状态
# BasStock 库存信息导出字段
stock.BasStock.stockId=库存ID
stock.BasStock.cargoSpaceId=货位ID
stock.BasStock.cargoSpaceName=货位名称
stock.BasStock.stockStatus=库存状态
stock.BasStock.productStatus=物料状态
stock.BasStock.lotNo=批次号
stock.BasStock.inDate=入库时间
stock.BasStock.backDate=回流时间
stock.BasStock.productGuid=物料GUID
stock.BasStock.quantity=库存数量
stock.BasStock.jobId=作业ID
stock.BasStock.trayCode=托盘条码
stock.BasStock.outQuantity=出库数量
stock.BasStock.stockinDetailId=入库子单ID
stock.BasStock.stockinId=入库主单
stock.BasStock.inType=入库类型
stock.BasStock.inClassId=入库班组ID
stock.BasStock.warehouseId=仓库ID
stock.BasStock.warehouseName=仓库名称
stock.BasStock.stackingId=垛型ID
stock.BasStock.spare1=备用字段1
stock.BasStock.spare2=备用字段2
stock.BasStock.spare3=备用字段3
stock.BasStock.spare4=备用字段4
stock.BasStock.spare5=备用字段5
stock.BasStock.spare6=备用字段6
stock.BasStock.cargoSpaceStatus=货位锁定状态
stock.BasStock.cargoSpaceStockStatus=货位库存状态
stock.BasStock.productId=物料ID
stock.BasStock.materialDesc=物料描述
stock.BasStock.englishDesc=物料英文描述
stock.BasStock.netWeight=净重
stock.BasStock.length=长度
stock.BasStock.width=宽度
stock.BasStock.height=高度
stock.BasStock.volume=体积
# BasStockFreezeRecord 库存冻结记录导出字段
stock.Freeze.stockId=库存编码
stock.Freeze.cargoSpaceId=货位编码
stock.Freeze.cargoSpaceName=货位名称
stock.Freeze.trayCode=托盘条码
stock.Freeze.productId=物品编码
stock.Freeze.productName=物品名称
stock.Freeze.printDate=生产日期
stock.Freeze.lotNo=批号
stock.Freeze.oldStatus=初始状态
stock.Freeze.currStatus=更改状态
stock.Freeze.method=操作
stock.Freeze.warehouseId=仓库
stock.Freeze.stockDetailId=库存字表ID
stock.Freeze.operatingTarget=操作目标
stock.Freeze.barCodeOldQuantity=条码数量(旧)
stock.Freeze.barCodeQuantity=条码数量(新)
stock.Freeze.productGuid=物料GUID
# BasStockMaintainRecord 库存操作记录导出字段
stock.Maintain.stockId=库存编码
stock.Maintain.cargoSpaceId=货位编码
stock.Maintain.cargoSpaceName=货位名称
stock.Maintain.trayCode=托盘条码
stock.Maintain.productId=物品编码
stock.Maintain.productName=物品名称
stock.Maintain.printDate=生产日期
stock.Maintain.lotNo=批号
stock.Maintain.oldQuantity=初始数量
stock.Maintain.quantity=操作后数量
stock.Maintain.method=操作
stock.Maintain.warehouseId=仓库
stock.Maintain.stockDetailId=库存字表ID
stock.Maintain.operatingTarget=操作目标
stock.Maintain.barCodeOldQuantity=条码数量(旧)
stock.Maintain.barCodeQuantity=条码数量(新)
stock.Maintain.productGuid=物料GUID
# BasSupplier 供应商管理导出字段
bas.Supplier.supplierNo=供应商编号
bas.Supplier.supplierGroupNo=供应商分组编号
bas.Supplier.supplierName=供应商名称
bas.Supplier.simpleName=简称
bas.Supplier.useable=是否可用
bas.Supplier.supplierArae=地区分类
bas.Supplier.taxpayerRegistrationNumber=纳税人登记号
bas.Supplier.country=国家
bas.Supplier.timeZone=时区
bas.Supplier.dataFormat=数据格式
bas.Supplier.receivingCountry=收货国家
bas.Supplier.taxCategory=税类
bas.Supplier.legalPerson=法人
bas.Supplier.registeredCapital=注册资金
bas.Supplier.address=企业地址
bas.Supplier.contactName=联系人姓名
bas.Supplier.contactNumber=联系电话
# BasCustomer 客户管理导出字段
bas.Customer.customerNo=客户编号
bas.Customer.customerGroupNo=客户基本分类
bas.Customer.customerName=客户名称
bas.Customer.simpleName=客户简称
bas.Customer.useable=是否可用
bas.Customer.businessDepartment=业务部门
bas.Customer.salesman=业务员
bas.Customer.mnemonicCode=助忆码
bas.Customer.type=客户类型
bas.Customer.taxpayerRegistrationNumber=纳税人登记号
bas.Customer.organization=对应财务组织
bas.Customer.supCustomer=上级客户
bas.Customer.retailInvestor=散户
bas.Customer.country=国家/地区
bas.Customer.timeZone=时区
bas.Customer.dataFormat=数据格式
bas.Customer.contactName=联系人姓名
bas.Customer.shipment=发货国家
bas.Customer.taxCategory=税类
# BasProduct 物料管理导出字段
bas.Product.productId=物料编码
bas.Product.parentId=父节点ID
bas.Product.price=价格
bas.Product.cargoNo=品牌
bas.Product.unit=单位
bas.Product.spec=规格
bas.Product.spare1=备用字段1
bas.Product.spare2=备用字段2
bas.Product.spare3=备用字段3
bas.Product.spare4=备用字段4
bas.Product.spare5=备用字段5
bas.Product.spare6=备用字段6
bas.Product.spare7=备用字段7
bas.Product.spare8=备用字段8
bas.Product.spare9=备用字段9
bas.Product.productName=物料名称
# BasProductPort 基础点位导出字段
bas.ProductPort.portName=点位名称
bas.ProductPort.portType=点位分类
bas.ProductPort.portDesc=点位描述
bas.ProductPort.createMan=创建人
# BasContainer 容器管理导出字段
bas.Container.containerId=容器编号
bas.Container.portName=点位名称
bas.Container.status=容器状态
bas.Container.productTypeQuantity=物料种类
bas.Container.capacity=容量
bas.Container.operationMan=操作人
# BasTraycodeFormat 条码生成规则导出字段
bas.TraycodeFormat.barcodeFormat=条码前缀
bas.TraycodeFormat.serialRule=流水号
bas.TraycodeFormat.serialExample=条码样例
bas.TraycodeFormat.remarks=描述
bas.TraycodeFormat.minNum=最小流水号
bas.TraycodeFormat.maxNum=最大流水号
bas.TraycodeFormat.spare1=备用字段1
bas.TraycodeFormat.spare2=备用字段2
bas.TraycodeFormat.spare3=备用字段3
# BasTraycode 条码信息导出字段
bas.Traycode.id=ID
bas.Traycode.formatId=条码类型ID
bas.Traycode.trayCode=条码
bas.Traycode.spare1=备用字段1
bas.Traycode.spare2=备用字段2
bas.Traycode.spare3=备用字段3
# BasWarehouse 仓库管理导出字段
bas.Warehouse.warehouseId=仓库ID
bas.Warehouse.warehouseNo=仓库编号
bas.Warehouse.projectNo=项目编号
bas.Warehouse.warehouseName=仓库名称
bas.Warehouse.address=仓库地址
bas.Warehouse.cDesc=仓库描述
bas.Warehouse.warehouseKind=仓库级别
bas.Warehouse.warehouseType=仓库类型
bas.Warehouse.isCurrent=是否可用
# BasCargoSpace 货位管理导出字段
bas.CargoSpace.warehouseId=仓库ID
bas.CargoSpace.roadwayId=巷道ID
bas.CargoSpace.cargoAreaId=货区ID
bas.CargoSpace.theType=货位类型
bas.CargoSpace.theTypeName=货位类型名称
bas.CargoSpace.cargoSpaceName=货位名称
bas.CargoSpace.thePlatoon=排
bas.CargoSpace.theColumn=列
bas.CargoSpace.theFloor=层
bas.CargoSpace.status=货位状态
bas.CargoSpace.locked=是否锁定
bas.CargoSpace.trayCode=托盘条码
bas.CargoSpace.cargoHight=货位高度
bas.CargoSpace.issDouble=是否双伸
bas.CargoSpace.groupCodingNo=双货位分组编码
bas.CargoSpace.groupCoding=双货位分组编码
bas.CargoSpace.cargoSpaceLogo=双货位标识
bas.CargoSpace.thisCargoArea=本仓库区域
#字典
dict.is_available.n=否
dict.is_available.y=是
dict.sys_user_sex.a1=男
dict.sys_user_sex.a2=女
dict.sys_user_sex.a3=未知
dict.sys_show_hide.a1=显示
dict.sys_show_hide.a2=隐藏
dict.sys_normal_disable.a1=正常
dict.sys_normal_disable.a2=停用
dict.sys_job_status.a1=正常
dict.sys_job_status.a2=暂停
dict.sys_job_group.a1=默认
dict.sys_job_group.a2=系统
dict.sys_yes_no.a1=是
dict.sys_yes_no.a2=否
dict.sys_notice_type.a1=通知
dict.sys_notice_type.a2=公告
dict.sys_notice_status.a1=正常
dict.sys_notice_status.a2=关闭
dict.sys_oper_type.a1=新增
dict.sys_oper_type.a2=修改
dict.sys_oper_type.a3=删除
dict.sys_oper_type.a4=授权
dict.sys_oper_type.a5=导出
dict.sys_oper_type.a6=导入
dict.sys_oper_type.a7=强退
dict.sys_oper_type.a8=生成代码
dict.sys_oper_type.a9=清空数据
dict.sys_oper_type.a10=其他
dict.sys_common_status.a1=成功
dict.sys_common_status.a2=失败
dict.in_bill_type.a1=自建单据
dict.in_bill_status.a1=未执行
dict.in_bill_status.a2=审核中
dict.in_bill_status.a3=正执行
dict.in_bill_status.a4=已完成
dict.in_bill_status.a5=已作废
dict.out_bill_type.a1=拣选出库
dict.out_bill_type.a2=退货单据
dict.out_bill_status.a1=待执行
dict.out_bill_status.a2=已审核
dict.out_bill_status.a3=正执行
dict.out_bill_status.a4=已完成
dict.out_bill_status.a5=已作废
dict.in_job_type.a1=空料箱入库
dict.in_job_type.a2=CTU物资入库
dict.in_job_type.a3=高架库物资入库
dict.in_job_type.a4=托盘垛入库
dict.mydo_job_status.a1=未执行
dict.mydo_job_status.a2=待执行
dict.mydo_job_status.a3=正执行
dict.mydo_job_status.a4=已完成
dict.mydo_job_status.a5=已作废
dict.execution_phase_type.a1=输送线
dict.execution_phase_type.a2=入库口
dict.execution_phase_type.a3=CTU
dict.execution_phase_type.a4=出库口
dict.on_line_type.a1=类型1
dict.on_line_type.a2=类型2
dict.out_job_type.a1=空料箱出库
dict.out_job_type.a2=空托盘出库
dict.out_job_type.a3=料箱出库
dict.out_job_type.a4=托盘出库
dict.stock_status.a1=正常
dict.stock_status.a2=冻结
dict.product_status.a1=正常
dict.product_status.a2=盘点待审批
dict.product_status.a3=异常
dict.stock_maintain_method.a1=新增
dict.stock_maintain_method.a2=修改
dict.stock_maintain_method.a3=删除
dict.receive_bill_status.a1=未质检
dict.receive_bill_status.a2=质检完成
dict.check_stock_type.a1=物料盘点
dict.check_stock_type.a2=货位盘点
dict.check_bill_status.a1=未执行
dict.check_bill_status.a2=审核中
dict.check_bill_status.a3=正执行
dict.check_bill_status.a4=已完成
dict.check_bill_status.a5=已作废
dict.product_port_rel_status.a1=是
dict.product_port_rel_status.a2=否
dict.check_in_job_type.a1=盘点料箱入库
dict.check_in_job_type.a2=盘点托盘入库
dict.check_out_job_type.a1=盘点料箱出库
dict.check_out_job_type.a2=盘点托盘出库
dict.cargo_space_status.a1=空
dict.cargo_space_status.a2=满
dict.cargo_space_status.a3=入库分配
dict.cargo_space_status.a4=出库分配
dict.cargo_space_status.a5=入库盘点分配
dict.cargo_space_status.a6=出库盘点分配
dict.warehouse_port_type.a1=入口
dict.warehouse_port_type.a2=出口
dict.port_type.a1=缓存点位
dict.port_type.a2=拣选工位
dict.port_type.a3=拣选放货点位
dict.port_type.a4=集货缓存点位
dict.port_type.a5=线边点位
dict.port_type.a6=台位点位
dict.cargo_space_lock_status.a1=锁定
dict.cargo_space_lock_status.a2=解锁
dict.warehouse_type.a1=高架
dict.warehouse_type.a2=CTU库
dict.warehouse_type.a3=平库
dict.record_type.a1=修改
dict.record_type.a2=新增
dict.record_type.a3=删除
dict.audit_diff_status.a1=未审核
dict.audit_diff_status.a2=审查通过
dict.audit_diff_status.a3=审核不通过
dict.agv_status.a1=无任务
dict.agv_status.a2=任务中

View File

@@ -23,9 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasWarehouseList" parameterType="BasWarehouse" resultMap="BasWarehouseResult">
<include refid="selectBasWarehouseVo"/>
<where>
<if test="warehouseId != null and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
<if test="warehouseNo != null and warehouseNo != ''">and warehouse_no = #{warehouseNo}</if>
<if test="projectNo != null and projectNo != ''">and project_no = #{projectNo}</if>
<if test="warehouseId != null and warehouseId != ''">and warehouse_id like concat('%',#{warehouseId}, '%')</if>
<if test="warehouseNo != null and warehouseNo != ''">and warehouse_no like concat('%',#{warehouseNo}, '%')</if>
<if test="projectNo != null and projectNo != ''">and project_no like concat('%',#{projectNo}, '%')</if>
<if test="warehouseName != null and warehouseName != ''">and warehouse_name like concat('%',
#{warehouseName}, '%')
</if>