no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WebsitGoodsLogic.java

@@ -405,7 +405,7 @@ public class WebsitGoodsLogic {
 
         for (int i = 0; i < objects.size(); i++) {
             List<Object> row = (List<Object>) objects.get(i);
-            CommonUtils.initList2(row, 11);
+            CommonUtils.initList2(row, 12);
             if (row.size() < 7) {
                 row.add(null);
                 row.add(null);
@@ -447,6 +447,7 @@ public class WebsitGoodsLogic {
             String specificationStr = (String) row.get(7);
             String remark = (String) row.get(8);
             String manageWorkerStock = (String) row.get(9);
+            String salesConvertQty = (String) row.get(9);
 
             if (!treeMap.containsKey(parentCategoryStr)) {
                 throw new RemoteServiceException("第" + (i+1) + "行, 大类信息不存在");
@@ -500,6 +501,11 @@ public class WebsitGoodsLogic {
                 goods.setManageWorkerStock(JudgeEnum.NO.getKey());
             }
 
+            if (StringUtils.isNotBlank(salesConvertQty)) {
+                BigDecimal convertQty = new BigDecimal(salesConvertQty);
+                goods.setGoodsSalesConvertQty(convertQty);
+            }
+
             goods.setNormType(NormTypeEnum.M.getKey());
 
             goodsList.add(goods);
@@ -647,7 +653,7 @@ public class WebsitGoodsLogic {
                 throw new RemoteServiceException("第" + (i + 1) + "行, 自有库存师傅分账金额不能大于收费标准");
             }
 
-            if ("空调-冰箱-生活电器".contains(partType)) {
+            if (!"空调-冰箱-生活电器".contains(partType)) {
                 throw new RemoteServiceException("第" + (i + 1) + "行, 配件类型错误");
             }
 

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

@@ -305,7 +305,7 @@ public class WebsitSalesRetLogic {
             workerStockDTO.setRef(websitSalesRet.getSalesRetId());
             workerStockDTO.setRefType("销售退货单");
             workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.getKey());
-            workerStockDTO.setChangeQty(websitSalesRetItem.getConvertQty());
+            workerStockDTO.setChangeQty(websitSalesRetItem.getRetConvertQty());
             workerStockDTO.setDirectFlag(DirectFlagEnum.SUB.getKey());
             workerStockDTO.setFlag(WorkerStockFlagEnum.REFUND.getKey());
             workerStockDTO.setObj("师傅");