src/main/java/com/jsh/erp/controller/MaterialController.java

@@ -866,7 +866,6 @@ public class MaterialController extends BaseController {
     public BaseResponseInfo findBatchNumberSBySelect(@RequestParam(value = "categoryId", required = false) Long categoryId,
                                            @RequestParam(value = "q", required = false) String q,
                                            @RequestParam(value = "standardOrModel", required = false) String standardOrModel,
-                                           @RequestParam(value = "mpList", required = false) String mpList,
                                            @RequestParam(value = "depotId", required = false) Long depotId,
                                            @RequestParam(value = "color", required = false) String color,
                                            @RequestParam(value = "brand", required = false) String brand,

src/main/java/com/jsh/erp/controller/materialBatch/MaterialBatchController.java

@@ -46,8 +46,9 @@ public class MaterialBatchController extends BaseController {
 
     @GetMapping(value = "/findBatchNumbersByBarCode")
     @ApiOperation(value = "根据条码查询批次号")
-    public AjaxResult findBatchNumbersByBarCode(@RequestParam(value = "barCodes",required = false) String barCodes){
-        List<MaterialBatch> dataList = materialBatchService.findBySelectWithBarCode(barCodes);
+    public AjaxResult findBatchNumbersByBarCode(@RequestParam(value = "barCodes",required = false) String barCodes,
+                                                @RequestParam(value = "depotId") Long depotId){
+        List<MaterialBatch> dataList = materialBatchService.findBySelectWithBarCode(barCodes,depotId);
         StringBuffer str = new StringBuffer();
         if (null != dataList) {
             for (MaterialBatch material : dataList) {

src/main/java/com/jsh/erp/datasource/dto/TaskStocktakingItemQueryDTO.java

@@ -15,7 +15,7 @@ public class TaskStocktakingItemQueryDTO {
     private Long categoryId;
 
     @ApiModelProperty("商品名称")
-    private Integer materialName;
+    private String materialName;
 
     @ApiModelProperty("批次号")
     private String batchNumber;

src/main/java/com/jsh/erp/datasource/mappers/MaterialExtendMapperEx.java

@@ -41,4 +41,6 @@ public interface MaterialExtendMapperEx {
      * 仓库删除校验
      */
     int getMaterialExtendCountByDepotIds(@Param("depotIds") String[] depotIds);
+
+    List<Long> getIdsByBarcode(@Param("barCodeList") List<String> barCodeList);
 }

src/main/java/com/jsh/erp/service/MaterialBatchService.java

@@ -56,7 +56,7 @@ public interface MaterialBatchService extends IService<MaterialBatch> {
      * 根据商品条码获取商品批次信息
      * @param barCodes 商品条码字符集合
      */
-    List<MaterialBatch> findBySelectWithBarCode(String barCodes);
+    List<MaterialBatch> findBySelectWithBarCode(String barCodes,Long depotId);
 
     /**
      * 根据批次号数组查询商品批次信息

src/main/java/com/jsh/erp/service/MaterialExtendService.java

@@ -60,4 +60,10 @@ public interface MaterialExtendService extends IService<MaterialExtend> {
     int getCountByManyBarCodeWithoutUs(String manyBarCode, String barCode);
 
     MaterialExtend getInfoByBatchNumber(String batchNumber)throws Exception;
+
+    /**
+     * 根据商品条码集合查询商品id
+     * @param barCodeList 商品条码
+     */
+    List<Long> selectIdsByBarCode(List<String> barCodeList);
 }

src/main/java/com/jsh/erp/service/impl/DepotHeadServiceImpl.java

@@ -2064,10 +2064,10 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
             depotItemService.updateCurrentUnitPrice(depotItem);
             //修改商品生产日期
             //materialExtendService.update(new UpdateWrapper<MaterialExtend>().set("production_date",materialMap.get(batchNumber).getProductionDate()).eq("id", materialExtend.getId()));
-            //修改订单总额
-            updateTotalPriceById(depotHead);
         }
-        //修改采购订单状态、操作人、操作时间
+        //修改订单总额
+        updateTotalPriceById(depotHead);
+        //修改采购订单状态、操作人、操作时间,数额
         this.update(new UpdateWrapper<DepotHead>().set("status", "2").set("oper_id",userInfo.getId()).set("submit_time",new Date()).eq("id", pdaDepotHeadDTO.getId()));
         return true;
     }
@@ -2087,7 +2087,7 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
             if (depotHead.getTotalPrice().compareTo(BigDecimal.ZERO) < 0){
                 totalPrice = totalPrice.negate();
             }
-            update(new UpdateWrapper<DepotHead>().set("total_price",totalPrice).set("change_amount",totalPrice).set("discount_last_money",sum).eq("id",list.get(0).getId()));
+            this.update(new UpdateWrapper<DepotHead>().set("total_price",totalPrice).set("change_amount",totalPrice).set("discount_last_money",sum).eq("id",depotHead.getId()));
         }
     }
 

src/main/java/com/jsh/erp/service/impl/MaterialBatchServiceImpl.java

@@ -42,6 +42,9 @@ public class MaterialBatchServiceImpl extends ServiceImpl<MaterialBatchMapper,Ma
     @Resource
     private InventoryLogService inventoryLogService;
 
+    @Resource
+    private MaterialService materialService;
+
 
     @Override
     public void generateMaterialBatchByDepotItemId(DepotItem depotItem, Long supplierId) throws Exception {
@@ -121,6 +124,7 @@ public class MaterialBatchServiceImpl extends ServiceImpl<MaterialBatchMapper,Ma
                 log.setType(type);
                 inventoryLogService.save(log);
                 update(new UpdateWrapper<MaterialBatch>().set("inventory",materialBatch.getInventory()).eq("id",materialBatch.getId()));
+                depotItemService.updateCurrentStockFun(materialBatch.getMaterialId(),materialBatch.getDepotId());
         }
     }
 
@@ -155,16 +159,17 @@ public class MaterialBatchServiceImpl extends ServiceImpl<MaterialBatchMapper,Ma
     }
 
     /**
-     * 根据商品条码获取商品批次信息
+     * 根据商品条码和仓库id获取商品批次信息
      * @param barCodes 商品条码字符集合
      */
     @Override
-    public List<MaterialBatch> findBySelectWithBarCode(String barCodes) {
+    public List<MaterialBatch> findBySelectWithBarCode(String barCodes,Long depotId) {
         List<String> barCodeList = null;
         if (barCodes != null && !barCodes.isEmpty()){
             barCodeList = Arrays.asList(barCodes.split(","));
         }
-        List<MaterialBatch> list = materialBatchMapper.selectList(new LambdaQueryWrapperX<MaterialBatch>().inIfPresent(MaterialBatch::getBarCode,barCodeList).gt(MaterialBatch::getInventory,BigDecimal.ZERO));
+        List<Long> ids = materialExtendService.selectIdsByBarCode(barCodeList);
+        List<MaterialBatch> list = materialBatchMapper.selectList(new LambdaQueryWrapperX<MaterialBatch>().eq(MaterialBatch::getDepotId,depotId).inIfPresent(MaterialBatch::getMaterialId,ids).gt(MaterialBatch::getInventory,BigDecimal.ZERO));
         return list;
     }
 

src/main/java/com/jsh/erp/service/impl/MaterialExtendServiceImpl.java

@@ -536,6 +536,16 @@ public class MaterialExtendServiceImpl extends ServiceImpl<MaterialExtendMapper,
     }
 
     /**
+     * 根据商品条码集合查询商品id
+     *
+     * @param barCodeList 商品条码
+     */
+    @Override
+    public List<Long> selectIdsByBarCode(List<String> barCodeList) {
+        return materialExtendMapperEx.getIdsByBarcode(barCodeList);
+    }
+
+    /**
      * 设置当前库存
      * @param depotId 仓库id
      * @param mId 商品id

src/main/java/com/jsh/erp/service/impl/TaskStocktakingServiceImpl.java

@@ -70,7 +70,7 @@ public class TaskStocktakingServiceImpl extends ServiceImpl<TaskStocktakingMappe
             List<MaterialBatch> materialBatchList;
             //全盘，抽盘，处理任务明细
             if (taskStocktakingDTO.getTaskType() == 1) {
-                materialBatchList = materialBatchMapper.selectList(new LambdaQueryWrapper<MaterialBatch>().ne(MaterialBatch::getInventory, BigDecimal.ZERO).isNotNull(MaterialBatch::getInventory));
+                materialBatchList = materialBatchMapper.selectList(new LambdaQueryWrapper<MaterialBatch>().ne(MaterialBatch::getInventory, BigDecimal.ZERO).isNotNull(MaterialBatch::getInventory).eq(MaterialBatch::getDepotId,taskStocktakingDTO.getDepotId()));
                 collect = materialBatchList
                         .stream()
                         .map(MaterialBatch::getPosition)
@@ -161,7 +161,7 @@ public class TaskStocktakingServiceImpl extends ServiceImpl<TaskStocktakingMappe
             List<MaterialBatch> materialExtendList;
             //全盘，抽盘，处理任务明细
             if (taskStocktakingDTO.getTaskType() == 1) {
-                materialExtendList = materialBatchMapper.selectList(new LambdaQueryWrapper<MaterialBatch>().ne(MaterialBatch::getInventory, BigDecimal.ZERO).isNotNull(MaterialBatch::getInventory));
+                materialExtendList = materialBatchMapper.selectList(new LambdaQueryWrapper<MaterialBatch>().ne(MaterialBatch::getInventory, BigDecimal.ZERO).isNotNull(MaterialBatch::getInventory).eq(MaterialBatch::getDepotId,taskStocktakingDTO.getDepotId()));
                 collect = materialExtendList
                         .stream()
                         .map(MaterialBatch::getPosition)

src/main/resources/mapper_xml/MaterialExtendMapperEx.xml

@@ -92,4 +92,18 @@
         )
         AND IFNULL(delete_Flag,'0') != '1'
     </select>
+
+    <select id="getIdsByBarcode" resultType="java.lang.Long">
+        SELECT DISTINCT material_id FROM jsh_material_extend
+        <where>
+            <if test="barCodeList != null and barCodeList.size()>0">
+                and bar_code in
+                <foreach collection="barCodeList" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            AND IFNULL(delete_Flag,'0') != '1'
+        </where>
+    </select>
+
 </mapper>