问题修正

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/vo/SubscribeDetailVo.java

@@ -4,13 +4,12 @@ import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * 申购单列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-03
  */
 @Getter
@@ -47,7 +46,9 @@ public class SubscribeDetailVo extends SubscribeDetail {
      */
     private String purchaseCount;
 
-    /**维多利亚扩展json*/
+    /**
+     * 维多利亚扩展json
+     */
     private String victoriatouristJson;
 
     /**
@@ -59,4 +60,9 @@ public class SubscribeDetailVo extends SubscribeDetail {
      * 收货仓库ID
      */
     private Long putWarehouseId;
+
+    /**
+     * 产品类型定义
+     */
+    private Integer productDefinition;
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -21,7 +21,6 @@ import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.common.utils.wrapper.SqlField;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,8 +79,8 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         if (CollectionUtils.isNotEmpty(productIds)) {
             wrapper.in("t1", SubscribeDetail::getBussinessId, productIds);
         }
-        if(StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.like("t2", Subscribe::getCode,dto.getKeyword());
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
+            wrapper.like("t2", Subscribe::getCode, dto.getKeyword());
         }
         wrapper.orderByDesc("t1", SubscribeDetail::getCreateTime);
         Page<SubscribeDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -96,6 +95,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
                     s.setProductType(vo.getType());
                     s.setProductCategory(vo.getClassifyName());
                     s.setProductUnit(vo.getUnit());
+                    s.setProductDefinition(vo.getDefinition());
                 }
             }
         }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferServiceImpl.java

@@ -18,6 +18,7 @@ import com.fjhx.victoriatourist.mapper.stock.StockTransferMapper;
 import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
 import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
 import com.fjhx.victoriatourist.service.stock.StockTransferService;
+import com.fjhx.victoriatourist.utils.Assert;
 import com.fjhx.victoriatourist.utils.CodeEnum;
 import com.fjhx.wms.entity.stock.dto.StockDto;
 import com.fjhx.wms.entity.stock.emums.JournalType;
@@ -109,6 +110,10 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(StockTransferDto stockTransferDto) {
+        Assert.notEmpty(stockTransferDto.getOutWarehouseId(),"出库仓库不能为空");
+        Assert.notEmpty(stockTransferDto.getInWarehouseId(),"入库仓库不能为空");
+        Assert.notEmpty(stockTransferDto.getStockTransferDetailsList(),"调仓明细不能为空");
+
         stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockTransferDto.setType(1);
         stockTransferDto.setInStatus(0);
@@ -205,6 +210,10 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
     @Override
     @DSTransactional
     public void stockTransfer(StockTransferDto stockTransferDto) {
+        Assert.notEmpty(stockTransferDto.getOutWarehouseId(),"出库仓库不能为空");
+        Assert.notEmpty(stockTransferDto.getInWarehouseId(),"入库仓库不能为空");
+        Assert.notEmpty(stockTransferDto.getStockTransferDetailsList(),"调仓明细不能为空");
+
         stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockTransferDto.setType(1);
         stockTransferDto.setInStatus(0);