FengChaoYu před 8 měsíci
rodič
revize
2f8d236f96

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WorkSalesStockLogic.java

@@ -59,7 +59,7 @@ public class WorkSalesStockLogic {
             workerStockDTO.setGoodsType(item.getGoodsType());
             workerStockDTO.setChangeQty(item.getConvertQty());
             workerStockDTO.setPrice(item.getConvertPrice());
-            workerStockDTO.setUnitName(item.getGoodsSalesUnit());
+            workerStockDTO.setGoodsStockUnit(item.getGoodsSalesUnit());
             workerStockDTO.setRef(sales.getSalesId());
             workerStockDTO.setRefType(refType);
             workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());

+ 3 - 3
mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WorkerStockLogic.java

@@ -175,7 +175,7 @@ public class WorkerStockLogic {
                 workerStockDTO.setGoodsName(workerGoods.getGoodsName());
                 workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.M.getKey());
                 workerStockDTO.setPrice(new BigDecimal(price));
-                workerStockDTO.setUnitName(workerGoods.getSalesUnit());
+                workerStockDTO.setGoodsStockUnit(workerGoods.getSalesUnit());
                 workerStockDTO.setRef(idStr);
                 workerStockDTO.setRefType("库存导入");
                 workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());
@@ -234,7 +234,7 @@ public class WorkerStockLogic {
                     workerStockDTO.setGoodsId(websitGoods.getGoodsId());
                     workerStockDTO.setGoodsName(websitGoods.getGoodsName());
                     workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
-                    workerStockDTO.setUnitName(websitGoods.getGoodsSalesUnit());
+                    workerStockDTO.setGoodsStockUnit(websitGoods.getGoodsSalesUnit());
                     workerStockDTO.setRef(idStr);
                     workerStockDTO.setRefType("库存导入");
                     workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());
@@ -260,7 +260,7 @@ public class WorkerStockLogic {
                     workerStockDTO2.setGoodsId(websitGoods.getGoodsId());
                     workerStockDTO2.setGoodsName(websitGoods.getGoodsName());
                     workerStockDTO2.setGoodsType(WebsitGoodsTypeEnum.P.getKey());
-                    workerStockDTO2.setUnitName(websitGoods.getGoodsSalesUnit());
+                    workerStockDTO2.setGoodsStockUnit(websitGoods.getGoodsSalesUnit());
                     workerStockDTO2.setRef(idStr);
                     workerStockDTO2.setRefType("库存导入");
                     workerStockDTO2.setPartsAttr(PartsAttrEnum.OLD.getKey());

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/WebsitPartsRetLogic.java

@@ -354,7 +354,7 @@ public class WebsitPartsRetLogic {
                 workerStockDTO.setGoodsName(websitPartsRetItem.getGoodsName());
                 workerStockDTO.setGoodsType(websitPartsRetItem.getGoodsType());
                 workerStockDTO.setPrice(websitPartsRetItem.getPrice());
-                workerStockDTO.setUnitName(websitPartsRetItem.getGoodsSalesUnit());
+                workerStockDTO.setGoodsStockUnit(websitPartsRetItem.getGoodsSalesUnit());
                 workerStockDTO.setRef(websitPartsRetItem.getPartsRetId());
                 workerStockDTO.setRefType("旧件返还");
                 workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());
@@ -427,7 +427,7 @@ public class WebsitPartsRetLogic {
             workerStockDTO.setGoodsName(websitPartsRetItem.getGoodsName());
             workerStockDTO.setGoodsType(websitPartsRetItem.getGoodsType());
             workerStockDTO.setPrice(websitPartsRetItem.getPrice());
-            workerStockDTO.setUnitName(websitPartsRetItem.getGoodsSalesUnit());
+            workerStockDTO.setGoodsStockUnit(websitPartsRetItem.getGoodsSalesUnit());
             workerStockDTO.setRef(websitPartsRetItem.getPartsRetId());
             workerStockDTO.setRefType("新件返还");
             workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/WebsitSalesRetLogic.java

@@ -297,7 +297,7 @@ public class WebsitSalesRetLogic {
             workerStockDTO.setWebsitGoodsQty(websitSalesRetItem.getRetQty());
             workerStockDTO.setGoodsType(websitSalesRetItem.getGoodsType());
             workerStockDTO.setPrice(websitSalesRetItem.getConvertPrice());
-            workerStockDTO.setUnitName(websitSalesRetItem.getGoodsSalesUnit());
+            workerStockDTO.setGoodsStockUnit(websitSalesRetItem.getGoodsSalesUnit());
             workerStockDTO.setGoodsSalesConvertQty(websitSalesRetItem.getGoodsSalesConvertQty());
             workerStockDTO.setGoodsSpecification(websitSalesRetItem.getGoodsSpecification());
             workerStockDTO.setGoodsId(websitSalesRetItem.getWorkerGoodsId());