字典国际化

2025-08-07 16:38:32 +08:00
parent 689792e285
commit 766eb3be1f
10 changed files with 140 additions and 61 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/submit/controller/OutPickSubmitController.java
+++ b/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")
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java
+++ b/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() {
-        return warehouseId;
-    }
+    /** 备用字段2 */
+    @Excel(name = "备用字段2")
+    private String spare2;

-    public void setWarehouseId(String warehouseId) {
-        this.warehouseId = warehouseId;
-    }
+    /** 备用字段3 */
+    @Excel(name = "备用字段3")
+    private String spare3;

-    public String getExitId() {
-        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)
+    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();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/submit/mapper/OutPickSubmitMapper.java
+++ b/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 
 {
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/submit/service/IOutPickSubmitService.java
+++ b/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 
 {
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/submit/service/impl/OutPickSubmitServiceImpl.java
+++ b/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 
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/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.setJobDetailId(mydoJobDetail.getJobDetailId());
-            outPickSubmitParam.setTrayCode(trayCodeMakeSure.getTrayCode());
+            outPickSubmitParam.setWarehouseId(trayCodeMakeSure.getWarehouseId());
+            outPickSubmitParam.setExitId(trayCodeMakeSure.getExitId());
+            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())) {
-                outPickSubmitParam.setQuantit(String.valueOf(Integer.parseInt(outPickSubmits.get(0).getQuantit()) - Integer.parseInt(mydoJobDetail.getPickBindQuantity())));
+            if (Integer.parseInt(outPickSubmits.get(0).getQuantity()) > 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 {