2024年1月5日15:07:08

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TGoods.java

@@ -74,7 +74,7 @@ public class TGoods extends BaseEntity {
      * 包装类型，存储id 显示名称 下拉选择类型，一个商品名称对应一个包装类型，对应t_package的f_id
      */
     @Excel(name = "包装类型，存储id 显示名称 下拉选择类型，一个商品名称对应一个包装类型，对应t_package的f_id")
-    private Long fPackageid;
+    private String fPackageid;
 
     /**
      * 账册号
@@ -269,11 +269,11 @@ public class TGoods extends BaseEntity {
         return fHscode;
     }
 
-    public void setfPackageid(Long fPackageid) {
+    public void setfPackageid(String fPackageid) {
         this.fPackageid = fPackageid;
     }
 
-    public Long getfPackageid() {
+    public String getfPackageid() {
         return fPackageid;
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TGoodsServiceImpl.java

@@ -150,7 +150,7 @@ public class TGoodsServiceImpl implements ITGoodsService {
     @Override
     public String checkUFNoUnique(TGoods tGoods) {
         TGoods tGoods1 = tGoodsMapper.checkFNoUnique(tGoods.getfNo());
-        if (StringUtils.isNotNull(tGoods1) && tGoods1.getfId()!=tGoods.getfId()) {
+        if (StringUtils.isNotNull(tGoods1) && !tGoods1.getfId().equals(tGoods.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -159,7 +159,7 @@ public class TGoodsServiceImpl implements ITGoodsService {
     @Override
     public String checkUFNnameUnique(TGoods tGoods) {
         TGoods tGoods1 = tGoodsMapper.checkUFNnameUnique(tGoods.getfName());
-        if (StringUtils.isNotNull(tGoods1) && tGoods1.getfId()!=tGoods.getfId()) {
+        if (StringUtils.isNotNull(tGoods1) && !tGoods1.getfId().equals(tGoods.getfId())) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -10509,7 +10509,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 goodsMaps.put("billOfLading", vo.getFMblno());
                 goodsMaps.put("goodsWeight", Double.parseDouble(vo.getFGrossweightD()));
                 goodsMaps.put("goodsQuantity", Integer.parseInt(vo.getFQtyD()));
-                goodsMaps.put("quantityUnit", "袋");
+                goodsMaps.put("quantityUnit", "托");
                 goodsMaps.put("weightUnit", "吨");
                 goodsMaps.put("warehouseCode", warehouse.getfId());
                 goodsMaps.put("warehouseName", warehouse.getfName());

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -409,11 +409,11 @@
         TG.f_no AS goodsCode,
         sdd.dict_label AS goodsType,
 
-        '袋' AS quantityUnit,
+        '托' AS quantityUnit,
         IFNULL( ROUND( SUM(TWG.f_netweightD) / 1000, 2 ), 0 ) AS totalNetWeight,
         IFNULL( ROUND( SUM(TWG.f_netweightblc) / 1000, 2 ), 0 ) AS availableWeight,
         '吨' AS weightUnit,
-        CONCAT_WS('-',IFNULL( TG.f_name, '' ),CONCAT_WS( IFNULL( TG.f_packagespecs, '' ), '/袋' ),IFNULL( TWG.f_marks, ''
+        CONCAT_WS('-',IFNULL( TG.f_name, '' ),CONCAT_WS( IFNULL( TG.f_packagespecs, '' ), '/托' ),IFNULL( TWG.f_marks, ''
         )) AS spu
         FROM t_warehouse TW
         LEFT JOIN t_whgenleg TWG ON TWG.f_warehouseid = TW.f_id
@@ -468,7 +468,7 @@
         '' AS level,
         TWG.f_qtyD AS totalQuantity,
         TWG.f_qtyblc AS availableQuantity,
-        '袋' AS quantityUnit,
+        '托' AS quantityUnit,
         IFNULL( ROUND( TWG.f_netweightD / 1000, 2 ), 0 ) AS totalNetWeight,
         IFNULL( ROUND( TWG.f_netweightblc / 1000, 2 ), 0 ) AS availableWeight,
         '吨' AS weightUnit,