修改 盘点库位

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

@@ -252,7 +252,7 @@ public class WmsPdaApiController extends BaseController {
     }
 
     /**
-     * 查询库存存储库位
+     * 盘点——查询库存存储库位
      *
      * @param type 原材料、半成品盘点
      * @param storeId 仓库id

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

@@ -25,7 +25,7 @@ public interface WmsInventoryMapper extends BaseMapperPlus<WmsInventory, WmsInve
 
     List<WmsInventoryVo> selectInventoryMaterialInfoList(@Param("entity")WmsInventoryBo bo);
 
-    List<WmsInventoryVo> selectSemiInventoryListByLocation(String locationCode);
+    List<WmsInventoryVo> selectSemiInventoryListByLocation(@Param("locationCode") String locationCode);
 
     // WmsInventoryVo outSelectInVentoryByBatch(WmsOutstockRecord outstockRecord);
 }

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

@@ -9,21 +9,16 @@ 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.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.wms.domain.*;
 import org.dromara.wms.domain.bo.BaseMaterialInfoBo;
-import org.dromara.wms.domain.bo.WmsAllocateOrderDetailBo;
 import org.dromara.wms.domain.bo.WmsInstockDetailBo;
-import org.dromara.wms.domain.bo.WmsInstockPrintBo;
 import org.dromara.wms.domain.vo.BaseMaterialInfoVo;
 import org.dromara.wms.domain.vo.WmsInstockDetailVo;
-import org.dromara.wms.domain.vo.WmsInstockOrderVo;
 import org.dromara.wms.mapper.WmsInstockDetailMapper;
 import org.dromara.wms.service.IBaseMaterialInfoService;
 import org.dromara.wms.service.IWmsInstockDetailService;
-import org.dromara.wms.service.IWmsInstockOrderService;
 import org.dromara.wms.service.IWmsInstockPrintService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -75,7 +69,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
     @Override
     public TableDataInfo<WmsInstockDetailVo> queryPageList(WmsInstockDetailBo bo, PageQuery pageQuery) {
         MPJLambdaWrapper<WmsInstockDetail> lqw = buildQueryWrapper(bo);
-        lqw.orderByDesc(WmsInstockDetail::getCreateTime);
+        // lqw.orderByDesc(WmsInstockDetail::getCreateTime);
         Page<WmsInstockDetailVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
@@ -128,7 +122,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
      */
     @Override
     public Boolean insertByBo(List<WmsInstockDetailBo> bo) {
-        ArrayList<WmsInstockDetail> list = new ArrayList<>();
+        // ArrayList<WmsInstockDetail> list = new ArrayList<>();
         int a = 0;
         String username = LoginHelper.getUsername();
         for (WmsInstockDetailBo detailBo : bo) {
@@ -159,7 +153,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
         if (bo.getPrintNum()==null){
             WmsInstockDetail update = MapstructUtils.convert(bo, WmsInstockDetail.class);
             update.setUpdateBy(username);
-            validEntityBeforeSave(update);
+            // validEntityBeforeSave(update);
             return baseMapper.updateDetail(update)>0;
         }
         if (bo.getPrintedNum()==null){
@@ -180,7 +174,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
         wmsInstockPrint.setApportionQty(bo.getPrintNum());
         wmsInstockPrint.setMaterialQty(bo.getBarcodeNum());
         wmsInstockPrint.setCreateBy(username);
-        int rows = wmsInstockPrintService.insertWmsInstockPrint(wmsInstockPrint);
+        // int rows = wmsInstockPrintService.insertWmsInstockPrint(wmsInstockPrint);
         WmsInstockDetail wmsInstockDetail = new WmsInstockDetail();
         wmsInstockDetail.setPrintedNum(bo.getPrintedNum().add(bo.getPrintNum()));
         LambdaUpdateWrapper<WmsInstockDetail> updateWrapper = new LambdaUpdateWrapper<>();
@@ -191,8 +185,7 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
     }
     public String generateOrder(Integer value){
         if (value.toString().length()<3){
-            String fixedLengthString = String.format("%03d", value);
+            return String.format("%03d", value);
-            return fixedLengthString;
         }else if (value.toString().length()==3){
             return value.toString();
         }
@@ -202,9 +195,8 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(WmsInstockDetail entity){
+    // private void validEntityBeforeSave(WmsInstockDetail entity){
-        //TODO 做一些数据校验,如唯一约束
+    // }
-    }
 
     @Override
     public int deleteByInstockId(Collection<Long> ids) {
@@ -227,9 +219,8 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        // if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        // }
-        }
         return baseMapper.deleteByIds(ids) > 0;
     }
 }

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsInventoryMapper.xml

@@ -77,9 +77,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by
             x.material_id
     </select>
-
+    <resultMap id="InventoryVoMap" type="org.dromara.wms.domain.vo.WmsInventoryVo">
-    <select id="selectSemiInventoryListByLocation" resultType="org.dromara.wms.domain.vo.WmsInventoryVo" >
+        <result property="inventoryId" column="obj_id"/>
-
+        <result property="batchCode" column="card_no"/>
+        <result property="materialId" column="material_id"/>
+        <result property="locationCode" column="store_place_code"/>
+        <result property="inventoryQty" column="storage_num"/>
+        <result property="materialCode" column="material_code"/>
+    </resultMap>
+    <select id="selectSemiInventoryListByLocation" resultMap="InventoryVoMap" >
+        select card_no,
+               material_id,
+               store_place_code,
+               storage_num,
+               material_code,
+               obj_id
+        from wms_hpp_storage_detail
+        where store_place_code= #{locationCode}
     </select>
 
 </mapper>

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml

@@ -94,10 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
      <select id="selectSemiCheckLocationList" resultMap="locationMap">
-        select store_place_code
+         select whsd.store_place_code
          from wms_hpp_storage_detail whsd
-                 left join wms_hpp_store_place wsp on wsp.obj_id = whsd.store_place_id
+                  left join wms_hpp_store_place wsp on wsp.store_place_code = whsd.store_place_code
-        where wsp.store_id=#{storeId} group by store_place_code
+        where wsp.store_id=#{storeId} group by whsd.store_place_code
     </select>