问题处理

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -72,10 +72,13 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
             if (1 == accountPeriodType) {
                 wrapper.isNotNull("json_unquote( si.victoriatourist_json -> '$.accountPeriod' )");
                 wrapper.apply("json_unquote( si.victoriatourist_json -> '$.accountPeriod' ) !=''");
+                wrapper.apply("json_unquote( si.victoriatourist_json -> '$.accountPeriod' ) !='0'");
             } else {
                 wrapper.isNull("json_unquote( si.victoriatourist_json -> '$.accountPeriod' )");
                 wrapper.or();
                 wrapper.apply("json_unquote( si.victoriatourist_json -> '$.accountPeriod' ) =''");
+                wrapper.or();
+                wrapper.apply("json_unquote( si.victoriatourist_json -> '$.accountPeriod' ) ='0'");
             }
         }
         Page<SupplierInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockVo.java

@@ -59,4 +59,7 @@ public class StockVo extends Stock {
      */
     private String warehouseName;
 
+    /**产品定义*/
+    private Integer definition;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -3,6 +3,7 @@ package com.fjhx.wms.service.stock.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.item.entity.product.po.ProductClassify;
@@ -80,6 +81,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             item.setProductName(productInfo.getName());
             item.setProductSpec(productInfo.getSpec());
             item.setProductClassifyId(productInfo.getProductClassifyId());
+            item.setDefinition(productInfo.getDefinition());
         });
         //赋值产品分类
         productClassifyService.attributeAssign(stockVos, StockVo::getProductClassifyId, (item, productClassify) -> {
@@ -181,7 +183,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     public void add(StockDto stockDto) {
         //创建出入库记录
         StockJournal stockJournal = new StockJournal();
@@ -199,7 +201,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     public void edit(StockDto stockDto) {
         //创建出入库记录
         StockJournal stockJournal = new StockJournal();
@@ -217,7 +219,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     public void stockTransfer(StockDto stockDto) {
         //创建出库记录
         StockJournal stockJournal = new StockJournal();
@@ -306,7 +308,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 newStocks.setId(oldStocks.getId());
                 newStocks.setQuantity(quantity);
             } else if (type == 2) {
-                throw new ServiceException("以下商品库存不足，无法出库：" + stock.getProductId());
+                ProductInfo productInfo = productInfoService.getById(stock.getProductId());
+                throw new ServiceException("以下商品库存不足，无法出库：" + productInfo.getName());
             }
 
             data.add(newStocks);