From b4227b5145943e067351a2a59ca34826b41d6fb7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 15 四月 2025 09:46:30 +0800
Subject: [PATCH] 界面翻译为俄语

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 346299c..09ef9c2 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,6 +1,8 @@
 package com.zy.asrs.utils;
 
 import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.result.Pakin;
 import com.zy.common.model.LocTypeDto;
 
 /**
@@ -11,13 +13,13 @@
 
     // 涓氬姟 ----------------------------------------------------------------------
 
-//    public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
+    //    public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
 //        wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
 //        wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
 //        wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
 //        wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
 //        wrkDetl.setColor(matCode.getBarcode()); // 鏉$爜
-//        wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+//        wrkDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
 //        wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
 //        wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
 //        wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
@@ -32,7 +34,7 @@
 //        wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
 //        wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
 //        wrkDetl.setColor(locDetl.getColor()); // 鏉$爜
-//        wrkDetl.setSupplier(locDetl.getSupplier()); // 鎵瑰彿
+//        wrkDetl.setSupplier(locDetl.getSupplier()); // 搴忓垪鐮�
 //        wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
 //        wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
 //        wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
@@ -46,7 +48,7 @@
 //        locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
 //        locDetl.setType(matCode.getStr5()); // 鍨嬪彿
 //        locDetl.setColor(matCode.getBarcode()); // 鏉$爜
-//        locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+//        locDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
 //        locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
 //        locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
 //        locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
@@ -61,7 +63,7 @@
 //        locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
 //        locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
 //        locDetl.setColor(wrkDetl.getColor()); // 鏉$爜
-//        locDetl.setSupplier(wrkDetl.getSupplier()); // 鎵瑰彿
+//        locDetl.setSupplier(wrkDetl.getSupplier()); // 搴忓垪鐮�
 //        locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
 //        locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
 //        locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
@@ -75,7 +77,7 @@
 //        waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
 //        waitPakIn.setType(matCode.getStr5()); // 鍨嬪彿
 //        waitPakIn.setColor(matCode.getBarcode()); // 鏉$爜
-//        waitPakIn.setSupplier(matCode.getStr6()); // 鎵瑰彿
+//        waitPakIn.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
 //        waitPakIn.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
 //        waitPakIn.setBrand(matCode.getStr3()); // 鍝侀」鏁�
 //        waitPakIn.setAltme(matCode.getStr1()); // 鍗曚綅
@@ -86,7 +88,7 @@
 //        orderDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
 //        orderDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
 //        orderDetl.setSpecs(matCode.getStr2()); // 瑙勬牸
-//        orderDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+//        orderDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
 //    }
 //
 //    public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
@@ -96,7 +98,7 @@
 //        waitPakIn.setOrderNo(orderDetl.getOrderNo());
 //        waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
 //        waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
-//        waitPakIn.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+//        waitPakIn.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
 //        waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
 //    }
 //
@@ -107,15 +109,27 @@
 //        wrkDetl.setOrderNo(orderDetl.getOrderNo());
 //        wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
 //        wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
-//        wrkDetl.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+//        wrkDetl.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
 //        wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
 //    }
+    public static void setPakin(Pakin pakin, Mat mat) {
+        pakin.setMatnr(mat.getMatnr());
+        pakin.setMaktx(mat.getMaktx());
+        pakin.setName(mat.getName());
+        pakin.setSpecs(mat.getSpecs());
+        pakin.setModel(mat.getModel());
+        pakin.setUnit(mat.getUnit());
+        pakin.setBarcode(mat.getBarcode());
+        pakin.setItemNum(Integer.valueOf(mat.getItemNum()));
+        pakin.setPrice(mat.getPrice());
+        pakin.setWeight(mat.getWeight());
+    }
 
 
     /**
-     *  搴撲綅绉昏浆鏃剁被鍨嬫娴�
+     * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
      **/
-    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
         // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
         if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
             return false;

--
Gitblit v1.9.1