字典国际化

ruoyi-admin/src/main/java/com/ruoyi/out/submit/controller/OutPickSubmitController.java

@@ -25,7 +25,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 出库拣选缓存记录Controller
  * 
  * @author ruoyi
- * @date 2025-07-10
+ * @date 2025-08-07
  */
 @RestController
 @RequestMapping("/out/submit")

ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java

@@ -9,13 +9,13 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 出库拣选缓存记录对象 out_pick_submit
  * 
  * @author ruoyi
- * @date 2025-07-10
+ * @date 2025-08-07
  */
 public class OutPickSubmit extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**  */
     private Long id;
 
     /** 托盘码 */
@@ -36,39 +36,29 @@ public class OutPickSubmit extends BaseEntity
 
     /** 物料数量 */
     @Excel(name = "物料数量")
-    private String quantit;
+    private String quantity;
 
+    /** 仓库 */
+    @Excel(name = "仓库")
     private String warehouseId;
 
+    /** 出口 */
+    @Excel(name = "出口")
     private String exitId;
 
-    private String productName;
+    /** 备用字段1 */
+    @Excel(name = "备用字段1")
+    private String spare1;
 
-    public String getWarehouseId() {
+    /** 备用字段2 */
-        return warehouseId;
+    @Excel(name = "备用字段2")
-    }
+    private String spare2;
 
-    public void setWarehouseId(String warehouseId) {
+    /** 备用字段3 */
-        this.warehouseId = warehouseId;
+    @Excel(name = "备用字段3")
-    }
+    private String spare3;
 
-    public String getExitId() {
+    public void setId(Long id) 
-        return exitId;
-    }
-
-    public void setExitId(String exitId) {
-        this.exitId = exitId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public void setId(Long id)
     {
         this.id = id;
     }
@@ -118,14 +108,64 @@ public class OutPickSubmit extends BaseEntity
         return productId;
     }
 
-    public void setQuantit(String quantit) 
+    public void setQuantity(String quantity) 
     {
-        this.quantit = quantit;
+        this.quantity = quantity;
     }
 
-    public String getQuantit() 
+    public String getQuantity() 
     {
-        return quantit;
+        return quantity;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setExitId(String exitId) 
+    {
+        this.exitId = exitId;
+    }
+
+    public String getExitId() 
+    {
+        return exitId;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
     }
 
     @Override
@@ -136,7 +176,12 @@ public class OutPickSubmit extends BaseEntity
             .append("jobId", getJobId())
             .append("jobDetailId", getJobDetailId())
             .append("productId", getProductId())
-            .append("quantit", getQuantit())
+            .append("quantity", getQuantity())
+            .append("warehouseId", getWarehouseId())
+            .append("exitId", getExitId())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
             .toString();
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/out/submit/mapper/OutPickSubmitMapper.java

@@ -7,7 +7,7 @@ import com.ruoyi.out.submit.domain.OutPickSubmit;
  * 出库拣选缓存记录Mapper接口
  * 
  * @author ruoyi
- * @date 2025-07-10
+ * @date 2025-08-07
  */
 public interface OutPickSubmitMapper 
 {

ruoyi-admin/src/main/java/com/ruoyi/out/submit/service/IOutPickSubmitService.java

@@ -7,7 +7,7 @@ import com.ruoyi.out.submit.domain.OutPickSubmit;
  * 出库拣选缓存记录Service接口
  * 
  * @author ruoyi
- * @date 2025-07-10
+ * @date 2025-08-07
  */
 public interface IOutPickSubmitService 
 {

ruoyi-admin/src/main/java/com/ruoyi/out/submit/service/impl/OutPickSubmitServiceImpl.java

@@ -11,7 +11,7 @@ import com.ruoyi.out.submit.service.IOutPickSubmitService;
  * 出库拣选缓存记录Service业务层处理
  * 
  * @author ruoyi
- * @date 2025-07-10
+ * @date 2025-08-07
  */
 @Service
 public class OutPickSubmitServiceImpl implements IOutPickSubmitService 

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java

@@ -362,6 +362,7 @@ public class PdaServiceImp implements PdaService {
             //outPickSubmitParam.setJobDetailId(mydoJobDetail.getJobDetailId());
             outPickSubmitParam.setWarehouseId(mydoJob.getWarehouseId());
             outPickSubmitParam.setExitId(mydoJob.getExitId());
+            outPickSubmitParam.setProductId(mydoJobDetail.getProductId());
             List<OutPickSubmit> outPickSubmits = outPickSubmitService.selectOutPickSubmitList(outPickSubmitParam);
             if (outPickSubmits.isEmpty()) {
                 //存入中间表
@@ -369,14 +370,14 @@ public class PdaServiceImp implements PdaService {
                 outPickSubmit.setJobId(mydoJob.getJobId());
                 outPickSubmit.setJobDetailId(mydoJobDetail.getJobDetailId());
                 outPickSubmit.setProductId(mydoJobDetail.getProductId());
-                outPickSubmit.setQuantit(mydoJobDetail.getOutQuantity());
+                outPickSubmit.setQuantity(mydoJobDetail.getOutQuantity());
                 outPickSubmit.setTrayCode(trayCodeMakeSure.getTrayCode());
                 outPickSubmit.setWarehouseId(mydoJob.getWarehouseId());
                 outPickSubmit.setExitId(mydoJob.getExitId());
                 outPickSubmitService.insertOutPickSubmit(outPickSubmit);
             } else {
                 OutPickSubmit oldOutPickSubmit = outPickSubmits.get(0);
-                oldOutPickSubmit.setQuantit(Convert.toBigDecimal(oldOutPickSubmit.getQuantit()).add(Convert.toBigDecimal(mydoJobDetail.getPickQuantity())).toString());
+                oldOutPickSubmit.setQuantity(Convert.toBigDecimal(oldOutPickSubmit.getQuantity()).add(Convert.toBigDecimal(mydoJobDetail.getPickQuantity())).toString());
                 outPickSubmitService.updateOutPickSubmit(oldOutPickSubmit);
             }
             //修改单据实际数量
@@ -746,12 +747,12 @@ public class PdaServiceImp implements PdaService {
             }
             //减少中间表数量
             OutPickSubmit outPickSubmitParam = new OutPickSubmit();
-            //outPickSubmitParam.setJobId(mydoJobDetail.getJobId());
+            outPickSubmitParam.setWarehouseId(trayCodeMakeSure.getWarehouseId());
-            //outPickSubmitParam.setJobDetailId(mydoJobDetail.getJobDetailId());
+            outPickSubmitParam.setExitId(trayCodeMakeSure.getExitId());
-            outPickSubmitParam.setTrayCode(trayCodeMakeSure.getTrayCode());
+            outPickSubmitParam.setProductId(mydoJobDetail.getProductId());
             List<OutPickSubmit> outPickSubmits = outPickSubmitService.selectOutPickSubmitList(outPickSubmitParam);
             for (OutPickSubmit outPickSubmit : outPickSubmits) {
-                BigDecimal subtract = Convert.toBigDecimal(outPickSubmit.getQuantit()).subtract(Convert.toBigDecimal(mydoJobDetail.getPickBindQuantity()));
+                BigDecimal subtract = Convert.toBigDecimal(outPickSubmit.getQuantity()).subtract(Convert.toBigDecimal(mydoJobDetail.getPickBindQuantity()));
                 if (subtract.compareTo(BigDecimal.ZERO) == 0) {
                     //删除缓存信息
                     outPickSubmitService.deleteOutPickSubmitById(outPickSubmit.getId());
@@ -759,7 +760,7 @@ public class PdaServiceImp implements PdaService {
 
                     return AjaxResult.warn(MessageUtils.message("warn.message12"));
                 } else {
-                    outPickSubmit.setQuantit(subtract.toString());
+                    outPickSubmit.setQuantity(subtract.toString());
                     outPickSubmitService.updateOutPickSubmit(outPickSubmit);
                 }
             }
@@ -775,7 +776,7 @@ public class PdaServiceImp implements PdaService {
         for (MydoJobDetail mydoJobDetail : trayCodeMakeSure.getMydoJobDetailList()) {
             basContainerDetails.setProductId(mydoJobDetail.getProductId());
             List<BasContainerDetails> basContainerDetailsList = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails);
-            if (basContainerDetailsList.size() == 0) {
+            if (basContainerDetailsList.isEmpty()) {
                 basContainerDetails.setProductName(mydoJobDetail.getExtraField().getMaterialDesc());
                 basContainerDetails.setQuantity(Convert.toLong(mydoJobDetail.getPickBindQuantity()));
                 basContainerDetailsService.insertBasContainerDetails(basContainerDetails);
@@ -791,8 +792,8 @@ public class PdaServiceImp implements PdaService {
             outPickSubmitParam.setExitId(trayCodeMakeSure.getExitId());
             outPickSubmitParam.setProductId(mydoJobDetail.getProductId());
             List<OutPickSubmit> outPickSubmits = outPickSubmitService.selectOutPickSubmitList(outPickSubmitParam);
-            if (Integer.parseInt(outPickSubmits.get(0).getQuantit()) > Integer.parseInt(mydoJobDetail.getPickBindQuantity())) {
+            if (Integer.parseInt(outPickSubmits.get(0).getQuantity()) > Integer.parseInt(mydoJobDetail.getPickBindQuantity())) {
-                outPickSubmitParam.setQuantit(String.valueOf(Integer.parseInt(outPickSubmits.get(0).getQuantit()) - Integer.parseInt(mydoJobDetail.getPickBindQuantity())));
+                outPickSubmitParam.setQuantity(String.valueOf(Integer.parseInt(outPickSubmits.get(0).getQuantity()) - Integer.parseInt(mydoJobDetail.getPickBindQuantity())));
                 outPickSubmitParam.setId(outPickSubmits.get(0).getId());
                 outPickSubmitService.updateOutPickSubmit(outPickSubmitParam);
             } else {

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

@@ -10,26 +10,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jobId"    column="job_id"    />
         <result property="jobDetailId"    column="job_detail_id"    />
         <result property="productId"    column="product_id"    />
-        <result property="quantit"    column="quantit"    />
+        <result property="quantity"    column="quantity"    />
-        <result property="productName"    column="product_name"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="exitId"    column="exit_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
     </resultMap>
 
     <sql id="selectOutPickSubmitVo">
-        select id, tray_code, job_id, job_detail_id, product_id, quantit,exit_id,warehouse_id from out_pick_submit
+        select id, tray_code, job_id, job_detail_id, product_id, quantity, warehouse_id, exit_id, spare1, spare2, spare3 from out_pick_submit
     </sql>
 
     <select id="selectOutPickSubmitList" parameterType="OutPickSubmit" resultMap="OutPickSubmitResult">
-        select s.id, s.tray_code, s.job_id, s.job_detail_id, s.product_id, s.quantit,p.product_name,s.exit_id,s.warehouse_id from out_pick_submit s left join bas_product p on s.product_id=p.product_id
+        <include refid="selectOutPickSubmitVo"/>
         <where>  
-            <if test="trayCode != null  and trayCode != ''"> and s.tray_code = #{trayCode}</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
             <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
             <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
-            <if test="productId != null  and productId != ''"> and s.product_id = #{productId}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
-            <if test="quantit != null  and quantit != ''"> and s.quantit = #{quantit}</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="warehouseId !=  null  and warehouseId != ''"> and s.warehouse_id = #{warehouseId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="exitId != null  and exitId != ''"> and s.exit_id = #{exitId}</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id = #{exitId}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
         </where>
     </select>
     
@@ -45,18 +50,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jobId != null">job_id,</if>
             <if test="jobDetailId != null">job_detail_id,</if>
             <if test="productId != null">product_id,</if>
-            <if test="quantit != null">quantit,</if>
+            <if test="quantity != null">quantity,</if>
             <if test="warehouseId != null">warehouse_id,</if>
             <if test="exitId != null">exit_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="trayCode != null">#{trayCode},</if>
             <if test="jobId != null">#{jobId},</if>
             <if test="jobDetailId != null">#{jobDetailId},</if>
             <if test="productId != null">#{productId},</if>
-            <if test="quantit != null">#{quantit},</if>
+            <if test="quantity != null">#{quantity},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
             <if test="exitId != null">#{exitId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
          </trim>
     </insert>
 
@@ -67,9 +78,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jobId != null">job_id = #{jobId},</if>
             <if test="jobDetailId != null">job_detail_id = #{jobDetailId},</if>
             <if test="productId != null">product_id = #{productId},</if>
-            <if test="quantit != null">quantit = #{quantit},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
             <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
             <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-ui/src/components/DictData/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import store from '@/store'
 import DataDict from '@/utils/dict'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import i18n from "@/lang";
 
 function searchDictByKey(dict, key) {
   if (key == null && key == "") {
@@ -31,8 +32,14 @@ function install() {
           } else {
             return new Promise((resolve, reject) => {
               getDicts(dictMeta.type).then(res => {
-                store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
+                //console.log(res.data)
-                resolve(res.data)
+                const translatedData = res.data.map(item => ({
+                  ...item,
+                  dictLabel: i18n.t(item.dictLabel) || item.dictLabel
+                }))
+                //console.log(translatedData)
+                store.dispatch('dict/setDict', { key: dictMeta.type, value: translatedData })
+                resolve(translatedData)
               }).catch(error => {
                 reject(error)
               })
@@ -46,4 +53,4 @@ function install() {
 
 export default {
   install,
-}
+}

ruoyi-ui/src/lang/zh.js

@@ -3898,5 +3898,12 @@ export default {
     callConfirm: '呼叫确认',
     shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
     callCancelled: '已取消呼叫'
+  },
+  dict:{
+    is_available:{
+      n:'否',
+      y:'是'
+    },
+  
   }
 }

ruoyi-ui/src/views/system/dict/data.vue

@@ -222,6 +222,7 @@
 <script>
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data"
 import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type"
+import i18n from "@/lang";
 
 export default {
   name: "Data",
@@ -334,6 +335,10 @@ export default {
     getList() {
       this.loading = true
       listData(this.queryParams).then(response => {
+        response.rows = response.rows.map(item => ({
+          ...item,
+          dictLabel: i18n.t(item.dictLabel) || item.dictLabel
+        }))
         this.dataList = response.rows
         this.total = response.total
         this.loading = false