到货添加批次修改

hx-sale/src/main/java/com/fjhx/sale/controller/arrival/ArrivalDetailController.java

@@ -40,4 +40,12 @@ public class ArrivalDetailController {
         arrivalDetailService.editAccountPeriods(dto);
     }
 
+    /**
+     * 修改到货批次
+     */
+    @PostMapping("/editArrivalBatch")
+    public void editArrivalBatch(@RequestBody ArrivalDetailDto dto) {
+        arrivalDetailService.editArrivalBatch(dto);
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/arrival/po/ArrivalDetail.java

@@ -58,4 +58,9 @@ public class ArrivalDetail extends BasePo {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM")
     private Date accountPeriod;
 
+    /**
+     * 到货批次
+     */
+    private String arrivalBatch;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/ArrivalDetailService.java

@@ -22,4 +22,6 @@ public interface ArrivalDetailService extends BaseService<ArrivalDetail> {
     Page<ArrivalDetailVo> getPage(ArrivalDetailSelectDto dto);
 
     void editAccountPeriods(ArrivalDetailDto dto);
+
+    void editArrivalBatch(ArrivalDetailDto dto);
 }

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.service.arrival.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+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.sale.entity.arrival.dto.ArrivalDetailDto;
@@ -72,6 +73,7 @@ public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, A
         return page;
     }
 
+    @DSTransactional
     @Override
     public void editAccountPeriods(ArrivalDetailDto dto) {
         this.updateById(dto);
@@ -91,4 +93,15 @@ public class ArrivalDetailServiceImpl extends ServiceImpl<ArrivalDetailMapper, A
         );
     }
 
+    @DSTransactional
+    @Override
+    public void editArrivalBatch(ArrivalDetailDto dto) {
+        this.update(q -> q
+                .eq(ArrivalDetail::getId, dto.getId())
+                .set(ArrivalDetail::getArrivalBatch, dto.getArrivalBatch())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
 }

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

@@ -53,6 +53,9 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         wrapper.eq("sj.to_warehouse_id", dto.getToWarehouseId());
         wrapper.eq("sjd.product_id", dto.getProductId());
 
+        wrapper.eq("sj.warehouse_id", dto.getWarehouseId());
+
+
         //关键字检索
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
             List<Long> pIds = productInfoService.listObject(ProductInfo::getId, q -> q