增加 原材料出库接口

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java

@@ -3,6 +3,7 @@ package org.dromara.wms.controller;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.wms.domain.WmsInventory;
 import org.dromara.wms.domain.bo.WmsReturnOrderBo;
 import org.dromara.wms.domain.vo.*;
 import org.dromara.wms.service.*;
@@ -46,7 +47,9 @@ public class WmsPdaApiController extends BaseController {
         }
         return toAjax(result);
     }
+
     private final IWmsBaseLocationService baseLocationService;
+
     @PostMapping("/raw/inSelectCode")
     public R<WmsInstockPrintVo> inSelectCode(String code) {
 
@@ -60,32 +63,35 @@ public class WmsPdaApiController extends BaseController {
 
     @PostMapping("/raw/inSubmit")
     public R<Void> inSubmit(@RequestBody WmsInstockPrintVo vo) {
-        WmsBaseLocationVo wmsBaseLocationVo=baseLocationService.selectLocationVoByCode( vo.getLocationCode());
+        WmsBaseLocationVo wmsBaseLocationVo = baseLocationService.selectLocationVoByCode(vo.getLocationCode());
         if (wmsBaseLocationVo == null) {
             return R.fail("库位条码扫描错误");
         }
-       vo.setWarehouseId( wmsBaseLocationVo.getWarehouseId());
+        vo.setWarehouseId(wmsBaseLocationVo.getWarehouseId());
         Boolean result = apiService.inSubmit(vo);
         return result ? R.ok() : R.fail();
     }
 
     /**
      * 查询出库单物料
+     *
      * @param orderCode 出库单号
      * @return 物料
      */
     @PostMapping("/raw/outSelectByOrderCode")
-    public R< List<WmsOutstockDetailVo>> outSelectByOrderCode(String orderCode) {
+    public R<List<WmsOutstockDetailVo>> outSelectByOrderCode(String orderCode) {
-        List<WmsOutstockDetailVo> wmsOutstockDetailVo=apiService.outSelectByOrderCode(orderCode);
+        List<WmsOutstockDetailVo> wmsOutstockDetailVo = apiService.outSelectByOrderCode(orderCode);
         if (wmsOutstockDetailVo == null) {
             return R.fail("出库单号不正确");
         }
         return R.ok(wmsOutstockDetailVo);
     }
-    @PostMapping("/raw/selectInVentoryByBatchCode")
-    public void  rawSelectInVentoryByBatchCode(String batchCode){
 
+    @PostMapping("/raw/selectInVentoryByBatchCode")
+    public void rawSelectInVentoryByBatchCode(String bacthCode, String locationCode) {
+        WmsInventoryVo wmsInventoryVo=apiService.selectInVentoryByBatchCode(bacthCode,locationCode);
     }
+
     /**
      * 成品跟载具绑定
      *

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInventory.java

@@ -95,7 +95,7 @@ public class WmsInventory{
     private String warehouseCode;//字段映射
 //    @TableField(exist = false)
     private String materialCode;//字段映射
-    private String warehouseId;
+    private Long warehouseId;
 
 
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java

@@ -28,4 +28,6 @@ public interface IWmsPdaApiService {
     Boolean inSubmit(WmsInstockPrintVo vo);
 
     List<WmsOutstockDetailVo> outSelectByOrderCode(String orderCode);
+
+    WmsInventoryVo selectInVentoryByBatchCode(String bacthCode, String locationCode);
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java

@@ -1,11 +1,14 @@
 package org.dromara.wms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.wms.domain.*;
@@ -15,6 +18,7 @@ import org.dromara.wms.service.IWmsPdaApiService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @RequiredArgsConstructor
@@ -182,10 +186,21 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         WmsInstockRecord wmsInstockRecord = new WmsInstockRecord();
         BeanUtils.copyProperties(vo, wmsInstockRecord);
         wmsInstockRecordMapper.insert(wmsInstockRecord);
-        // 插入库存
+        // 查询
-        WmsInventory inventory = new WmsInventory();
+        WmsInventoryVo wmsInventoryVo = selectInVentoryByBatchCode(vo.getBatchCode(), vo.getLocationCode());
-        BeanUtils.copyProperties(vo, inventory);
+        if (wmsInventoryVo == null) {
-        wmsInventoryMapper.insert(inventory);
+            // 插入库存
+            WmsInventory inventory = new WmsInventory();
+            BeanUtils.copyProperties(vo, inventory);
+            inventory.setInventoryQty(BigDecimal.valueOf(vo.getInstockQty()));
+            wmsInventoryMapper.insert(inventory);
+        }else {
+            WmsInventory inventory = new WmsInventory();
+            inventory.setInventoryId(wmsInventoryVo.getInventoryId());
+            inventory.setInventoryQty(wmsInventoryVo.getInventoryQty().add(BigDecimal.valueOf(wmsInstockRecord.getInstockQty())) );
+            wmsInventoryMapper.updateById(inventory);
+        }
+
         return true;
     }
 
@@ -200,4 +215,13 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
             .eq(WmsOutstockDetail::getOutstockCode, orderCode);
         return wmsOutstockDetailMapper.selectVoList(lqw);
     }
+
+    @Override
+    public WmsInventoryVo selectInVentoryByBatchCode(String bacthCode, String locationCode) {
+        LambdaQueryWrapper<WmsInventory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(WmsInventory::getBatchCode, bacthCode)
+            .eq(WmsInventory::getLocationCode, locationCode);
+        return wmsInventoryMapper.selectVoOne(lqw);
+    }
+
 }