Merge remote-tracking branch 'origin/dev' into dev

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

@@ -95,6 +95,13 @@ public class WmsWarehouseInfoController extends BaseController {
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsWarehouseInfoBo bo) {
+        WmsWarehouseInfoBo bo1 = new WmsWarehouseInfoBo();
+        bo1.setWarehouseCode(bo.getWarehouseCode());
+        List<WmsWarehouseInfoVo> list = wmsWarehouseInfoService.queryList(bo1);
+        if (!list.isEmpty() && !list.get(0).getWarehouseId().equals(bo.getWarehouseId())) {
+            return R.fail("仓库编码已存在");
+        }
+
         return toAjax(wmsWarehouseInfoService.updateByBo(bo));
     }
 

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsInventoryDetailsBo.java

@@ -82,4 +82,5 @@ public class WmsInventoryDetailsBo extends BaseEntity {
      * 物料单位
      */
     private String unitName;
+    private String delFlag;
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsInventoryDetailsMapper.java

@@ -20,4 +20,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WmsInventoryDetailsMapper extends BaseMapperPlus<WmsInventoryDetails, WmsInventoryDetailsVo> {
 
+    int updataDetailsByInventoryId(WmsInventoryDetails inventoryDetails);
+
 }

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

@@ -71,4 +71,6 @@ public interface IWmsInventoryDetailsService {
     TableDataInfo<WmsInventoryDetailsVo> listCount(WmsInventoryDetailsBo bo, PageQuery pageQuery);
 
     WmsInventoryDetails queryInventory(WmsInventoryDetailsBo inventory);
+
+    Double workUpdateInventory(Long inventoryDetailsId, Double disposalQty);
 }

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

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.wms.domain.WmsBaseProduct;
 import org.dromara.wms.domain.WmsInventoryDetails;
 import org.dromara.wms.domain.WmsWarehouseInfo;
@@ -71,7 +73,7 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi
             .selectAs("sum(locked_amount)", WmsInventoryDetails::getLockedAmount)
             .select(WmsInventoryDetails::getWarehouseId, WmsInventoryDetails::getMaterielId)
             .leftJoin(WmsBaseProduct.class, WmsBaseProduct::getProductId, WmsInventoryDetails::getMaterielId) // 物料
-            .select(WmsBaseProduct::getProductName, WmsBaseProduct::getProductCode, WmsBaseProduct::getExternalBrand,WmsBaseProduct::getProductSpe) // 物料名称、编码、品牌
+            .select(WmsBaseProduct::getProductName, WmsBaseProduct::getProductCode, WmsBaseProduct::getExternalBrand, WmsBaseProduct::getProductSpe) // 物料名称、编码、品牌
             .leftJoin(WmsWarehouseInfo.class, WmsWarehouseInfo::getWarehouseId, WmsInventoryDetails::getWarehouseId) // 仓库
             .select(WmsWarehouseInfo::getWarehouseName)
             .eq(bo.getWarehouseId() != null, WmsInventoryDetails::getWarehouseId, bo.getWarehouseId()) // 仓库id
@@ -160,7 +162,6 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi
     }
 
 
-
     @Override
     public WmsInventoryDetails queryInventory(WmsInventoryDetailsBo bo) {
         MPJLambdaWrapper<WmsInventoryDetails> lqw = JoinWrappers.lambda(WmsInventoryDetails.class)
@@ -174,4 +175,24 @@ public class WmsInventoryDetailsServiceImpl implements IWmsInventoryDetailsServi
 
         return baseMapper.selectOne(lqw);
     }
+
+    @Override
+    public Double workUpdateInventory(Long inventoryDetailsId, Double disposalQty) {
+
+        WmsInventoryDetails inventory = baseMapper.selectById(inventoryDetailsId);
+        Double inventoryAmount = inventory.getInventoryAmount();
+        double lossQty = inventoryAmount - disposalQty;
+        if (lossQty < 0) {
+            throw new IllegalArgumentException("库存数量不足");
+        }
+
+        inventory.setInventoryAmount(lossQty);
+        if (lossQty == 0.0) {
+            inventory.setDelFlag("1");
+        }
+        inventory.setUpdateBy(LoginHelper.getUserId());
+        inventory.setUpdateTime(DateUtils.getNowDate());
+        baseMapper.updataDetailsByInventoryId(inventory);
+        return inventoryAmount;
+    }
 }

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

@@ -1,26 +1,25 @@
 package org.dromara.wms.service.impl;
 
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-    import org.dromara.common.mybatis.core.page.TableDataInfo;
-    import org.dromara.common.mybatis.core.page.PageQuery;
-    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.wms.domain.WmsBaseProduct;
+import org.dromara.wms.domain.WmsInventoryLedger;
 import org.dromara.wms.domain.WmsWarehouseInfo;
-import org.springframework.stereotype.Service;
 import org.dromara.wms.domain.bo.WmsInventoryLedgerBo;
 import org.dromara.wms.domain.vo.WmsInventoryLedgerVo;
-import org.dromara.wms.domain.WmsInventoryLedger;
 import org.dromara.wms.mapper.WmsInventoryLedgerMapper;
 import org.dromara.wms.service.IWmsInventoryLedgerService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 库存变动台账Service业务层处理
@@ -41,23 +40,23 @@ public class WmsInventoryLedgerServiceImpl implements IWmsInventoryLedgerService
      * @return 库存变动台账
      */
     @Override
-    public WmsInventoryLedgerVo queryById(Long ledgerId){
+    public WmsInventoryLedgerVo queryById(Long ledgerId) {
         return baseMapper.selectVoById(ledgerId);
     }
 
-        /**
-         * 分页查询库存变动台账列表
-         *
-         * @param bo        查询条件
-         * @param pageQuery 分页参数
-         * @return 库存变动台账分页列表
-         */
-        @Override
-        public TableDataInfo<WmsInventoryLedgerVo> queryPageList(WmsInventoryLedgerBo bo, PageQuery pageQuery) {
-            MPJLambdaWrapper<WmsInventoryLedger> lqw = buildQueryWrapper(bo);
-            Page<WmsInventoryLedgerVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-            return TableDataInfo.build(result);
-        }
+    /**
+     * 分页查询库存变动台账列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 库存变动台账分页列表
+     */
+    @Override
+    public TableDataInfo<WmsInventoryLedgerVo> queryPageList(WmsInventoryLedgerBo bo, PageQuery pageQuery) {
+        MPJLambdaWrapper<WmsInventoryLedger> lqw = buildQueryWrapper(bo);
+        Page<WmsInventoryLedgerVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
 
     /**
      * 查询符合条件的库存变动台账列表
@@ -74,18 +73,19 @@ public class WmsInventoryLedgerServiceImpl implements IWmsInventoryLedgerService
     private MPJLambdaWrapper<WmsInventoryLedger> buildQueryWrapper(WmsInventoryLedgerBo bo) {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<WmsInventoryLedger> lqw = JoinWrappers.lambda(WmsInventoryLedger.class)
-        .selectAll(WmsInventoryLedger.class)
-                    .like(StringUtils.isNotBlank(bo.getLocationCode()), WmsInventoryLedger::getLocationCode, bo.getLocationCode())
-                    .eq(bo.getWarehouseId() != null, WmsInventoryLedger::getWarehouseId, bo.getWarehouseId())
-                    .eq(bo.getMaterielId() != null, WmsInventoryLedger::getMaterielId, bo.getMaterielId())
-                    .eq(StringUtils.isNotBlank(bo.getBatchNumber()), WmsInventoryLedger::getBatchNumber, bo.getBatchNumber())
-                    .eq(StringUtils.isNotBlank(bo.getChangeType()), WmsInventoryLedger::getChangeType, bo.getChangeType())
-                    .eq(StringUtils.isNotBlank(bo.getLedgerState()), WmsInventoryLedger::getLedgerState, bo.getLedgerState())
+            .selectAll(WmsInventoryLedger.class)
+            .like(StringUtils.isNotBlank(bo.getLocationCode()), WmsInventoryLedger::getLocationCode, bo.getLocationCode())
+            .eq(bo.getWarehouseId() != null, WmsInventoryLedger::getWarehouseId, bo.getWarehouseId())
+            // .eq(bo.getMaterielId() != null, WmsInventoryLedger::getMaterielId, bo.getMaterielId())
+            .eq(StringUtils.isNotBlank(bo.getBatchNumber()), WmsInventoryLedger::getBatchNumber, bo.getBatchNumber())
+            .eq(StringUtils.isNotBlank(bo.getChangeType()), WmsInventoryLedger::getChangeType, bo.getChangeType())
+            .eq(StringUtils.isNotBlank(bo.getLedgerState()), WmsInventoryLedger::getLedgerState, bo.getLedgerState())
             .leftJoin(WmsBaseProduct.class, WmsBaseProduct::getProductId, WmsInventoryLedger::getMaterielId)
-            .select(WmsBaseProduct::getProductName, WmsBaseProduct::getProductCode,WmsBaseProduct::getProductSpe)
+            .select(WmsBaseProduct::getProductName, WmsBaseProduct::getProductCode, WmsBaseProduct::getProductSpe)
+            .like(StringUtils.isNotBlank(bo.getProductCode()), WmsBaseProduct::getProductCode, bo.getProductCode())
+            .eq(StringUtils.isNotBlank(bo.getProductName()), WmsBaseProduct::getProductName, bo.getProductName())
             .leftJoin(WmsWarehouseInfo.class, WmsWarehouseInfo::getWarehouseId, WmsInventoryLedger::getWarehouseId)
-            .select(WmsWarehouseInfo::getWarehouseName, WmsWarehouseInfo::getWarehouseCode)
-;
+            .select(WmsWarehouseInfo::getWarehouseName, WmsWarehouseInfo::getWarehouseCode);
         return lqw;
     }
 
@@ -122,7 +122,7 @@ public class WmsInventoryLedgerServiceImpl implements IWmsInventoryLedgerService
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(WmsInventoryLedger entity){
+    private void validEntityBeforeSave(WmsInventoryLedger entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -135,7 +135,7 @@ public class WmsInventoryLedgerServiceImpl implements IWmsInventoryLedgerService
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;

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

@@ -5,24 +5,29 @@ import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.system.api.RemoteCodeRuleService;
 import org.dromara.wms.domain.WmsInventoryDetails;
+import org.dromara.wms.domain.WmsInventoryLedger;
 import org.dromara.wms.domain.WmsOutStockBill;
 import org.dromara.wms.domain.WmsOutStockDetails;
 import org.dromara.wms.domain.bo.WmsOutStockBillBo;
-import org.dromara.wms.domain.vo.WmsInventoryDetailsVo;
 import org.dromara.wms.domain.vo.WmsOutStockBillVo;
 import org.dromara.wms.mapper.WmsInventoryDetailsMapper;
+import org.dromara.wms.mapper.WmsInventoryLedgerMapper;
 import org.dromara.wms.mapper.WmsOutStockBillMapper;
 import org.dromara.wms.mapper.WmsOutStockDetailsMapper;
 import org.dromara.wms.service.IWmsOutStockBillService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -39,9 +44,10 @@ public class WmsOutStockBillServiceImpl implements IWmsOutStockBillService {
 
     private final WmsOutStockBillMapper baseMapper;
     private final WmsOutStockDetailsMapper wmsOutStockDetailsMapper;
+    private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper;
+    private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper;
     @DubboReference
     private RemoteCodeRuleService remoteCodeRuleService;
-    private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper;
 
     /**
      * 查询出库单
@@ -112,19 +118,40 @@ public class WmsOutStockBillServiceImpl implements IWmsOutStockBillService {
         if (flag) {
             Long outStockBillId = add.getOutStockBillId();
             List<WmsOutStockDetails> outStockDetailsList = bo.getOutStockDetailsList();
+            List<WmsInventoryLedger> wmsInventoryLedgers = new ArrayList<>();
             outStockDetailsList.forEach(item -> {
-
                 item.setOutStockBillId(outStockBillId);
                 // 从出库明细中获取库存ID
                 Long inventoryId = item.getInventoryDetailsId();
                 WmsInventoryDetails inventory = wmsInventoryDetailsMapper.selectById(inventoryId);
-                if (inventory.getInventoryAmount()<item.getOutStockAmount()) {
+                Double inventoryAmount = inventory.getInventoryAmount();
+                double lossQty = inventoryAmount - item.getOutStockAmount();
+                if (lossQty < 0) {
                     throw new IllegalArgumentException("库存数量不足");
                 }
 
+                inventory.setInventoryAmount(lossQty);
+                if (lossQty == 0.0){
+                    inventory.setDelFlag("1");
+                }
+                inventory.setUpdateBy( LoginHelper.getUserId());
+                inventory.setUpdateTime(DateUtils.getNowDate());
+                wmsInventoryDetailsMapper.updataDetailsByInventoryId(inventory);
+                //库存变动
+                WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
+                wmsInventoryLedger.setWarehouseId(item.getWarehouseId());
+                wmsInventoryLedger.setBatchNumber(item.getBatchNumber());
+                wmsInventoryLedger.setMaterielId(item.getMaterielId());
+                wmsInventoryLedger.setChangeType("3");//变动类型
+                wmsInventoryLedger.setLedgerState("0");
+                wmsInventoryLedger.setChangeAmount(item.getOutStockAmount());
+                wmsInventoryLedger.setInventoryAmount(inventoryAmount);
+                wmsInventoryLedgers.add(wmsInventoryLedger);
             });
             //插入出库明细
             wmsOutStockDetailsMapper.insert(outStockDetailsList);
+            //插入库存变动
+            wmsInventoryLedgerMapper.insert(wmsInventoryLedgers);
         }
         return flag;
     }

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

@@ -8,15 +8,17 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.wms.domain.ErpProjectInfo;
-import org.dromara.wms.domain.WmsBaseProduct;
-import org.dromara.wms.domain.WmsSampleLedger;
+import org.dromara.wms.domain.*;
 import org.dromara.wms.domain.bo.WmsSampleLedgerBo;
 import org.dromara.wms.domain.vo.WmsSampleLedgerVo;
+import org.dromara.wms.mapper.WmsInventoryDetailsMapper;
+import org.dromara.wms.mapper.WmsInventoryLedgerMapper;
 import org.dromara.wms.mapper.WmsSampleLedgerMapper;
+import org.dromara.wms.service.IWmsInventoryDetailsService;
 import org.dromara.wms.service.IWmsSampleLedgerService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +34,8 @@ import java.util.Map;
 public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService {
 
     private final WmsSampleLedgerMapper baseMapper;
+    private final IWmsInventoryDetailsService inventoryDetailsService;
+    private final WmsInventoryLedgerMapper wmsInventoryLedgerMapper;
 
     /**
      * 查询样品管理
@@ -100,6 +104,24 @@ public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService {
      */
     @Override
     public Boolean insertByBo(List<WmsSampleLedger> bo) {
+        List<WmsInventoryLedger> wmsInventoryLedgers = new ArrayList<>(bo.size());
+        bo.forEach(item -> {
+            Long inventoryId = item.getInventoryDetailsId();
+            Double lentQty = item.getLentQty();
+            Double inventoryAmount = inventoryDetailsService.workUpdateInventory(inventoryId, lentQty);
+            //库存变动
+            WmsInventoryLedger wmsInventoryLedger = new WmsInventoryLedger();
+            wmsInventoryLedger.setWarehouseId(item.getWarehouseId());
+            wmsInventoryLedger.setBatchNumber(item.getBatchNumber());
+            wmsInventoryLedger.setMaterielId(item.getMaterielId());
+            wmsInventoryLedger.setChangeType("4");//变动类型
+            wmsInventoryLedger.setLedgerState("0");
+            wmsInventoryLedger.setChangeAmount(lentQty);
+            wmsInventoryLedger.setInventoryAmount(inventoryAmount);
+            wmsInventoryLedgers.add(wmsInventoryLedger);
+        });
+
+        wmsInventoryLedgerMapper.insert(wmsInventoryLedgers);
         baseMapper.insert(bo);
         return true;
     }
@@ -124,7 +146,7 @@ public class WmsSampleLedgerServiceImpl implements IWmsSampleLedgerService {
     /**
      * 校验并批量删除样品管理信息
      *
-     * @param ids     待删除的主键集合
+     * @param ids 待删除的主键集合
      * @return 是否删除成功
      */
     @Override

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

@@ -73,7 +73,8 @@ public class WmsWarehouseInfoServiceImpl implements IWmsWarehouseInfoService {
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<WmsWarehouseInfo> lqw = JoinWrappers.lambda(WmsWarehouseInfo.class)
             .selectAll(WmsWarehouseInfo.class)
-            .like(StringUtils.isNotBlank(bo.getWarehouseName()), WmsWarehouseInfo::getWarehouseName, bo.getWarehouseName())
+            .eq(StringUtils.isNotBlank(bo.getWarehouseCode()), WmsWarehouseInfo::getWarehouseCode, bo.getWarehouseCode())
+            .eq(StringUtils.isNotBlank(bo.getWarehouseName()), WmsWarehouseInfo::getWarehouseName, bo.getWarehouseName())
             .eq(StringUtils.isNotBlank(bo.getWarehouseType()), WmsWarehouseInfo::getWarehouseType, bo.getWarehouseType())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), WmsWarehouseInfo::getActiveFlag, bo.getActiveFlag())
             .leftJoin(SysDept.class, SysDept::getDeptId, WmsWarehouseInfo::getDeptId)
@@ -90,7 +91,6 @@ public class WmsWarehouseInfoServiceImpl implements IWmsWarehouseInfoService {
     @Override
     public Boolean insertByBo(WmsWarehouseInfoBo bo) {
         WmsWarehouseInfo add = MapstructUtils.convert(bo, WmsWarehouseInfo.class);
-
         boolean flag = baseMapper.insert(add) > 0;
         // if (flag) {
         //     bo.setWarehouseId(add.getWarehouseId());

ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsInventoryDetailsMapper.xml

@@ -6,9 +6,16 @@
     <resultMap type="org.dromara.wms.domain.vo.WmsInventoryDetailsVo" id="WmsInventoryDetailsResult">
     </resultMap>
 
-    <select id="selectCustomWmsInventoryDetailsVoList" resultMap="WmsInventoryDetailsResult">
-        select inventory_details_id, tenant_id, location_code, warehouse_id, materiel_id, batch_number, inventory_amount, locked_amount, remark, del_flag, create_dept, create_by, create_time, update_by, update_time from wms_inventory_details t
-            ${ew.getCustomSqlSegment}
-    </select>
+
+    <update id="updataDetailsByInventoryId" parameterType="org.dromara.wms.domain.WmsInventoryDetails">
+        update wms_inventory_details
+        <set>
+            <if test="inventoryAmount != null">inventory_amount = #{inventoryAmount},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </set>
+        where inventory_details_id = #{inventoryDetailsId}
+    </update>
 
 </mapper>