Browse Source

库存标签

master
常熟吴彦祖 5 months ago
parent
commit
4f870e2076
  1. 24
      src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java
  2. 3
      src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java
  3. 2
      src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java
  4. 7
      src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java
  5. 45
      src/main/resources/mapper/wms/WmsPrintMapper.xml

24
src/main/java/com/gaotao/modules/wms/controller/WmsPrintController.java

@ -89,16 +89,16 @@ public class WmsPrintController {
return R.ok().put("rows", rows);
}
// /**
// *
// * @description 库存标签数据
// * @author 常熟吴彦祖
// * @date 2025/8/20 14:00
// * @return R
// */
// @PostMapping("getKuCunLabelData")
// public R getKuCunLabelData(@RequestBody InventoryStockOutData inData){
// PageUtils page = wmsPrintService.getKuCunLabelData( inData);
// return R.ok().put("page", page);
// }
/**
*
* @description 库存标签数据
* @author 常熟吴彦祖
* @date 2025/8/20 14:00
* @return R
*/
@PostMapping("getKuCunLabelData")
public R getKuCunLabelData(@RequestBody InventoryStockOutData inData){
PageUtils page = wmsPrintService.getKuCunLabelData( inData);
return R.ok().put("page", page);
}
}

3
src/main/java/com/gaotao/modules/wms/dao/WmsPrintDao.java

@ -3,6 +3,7 @@ package com.gaotao.modules.wms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gaotao.modules.inventoryStock.entity.InventoryStockOutData;
import com.gaotao.modules.pms.data.QcDetailReport;
import com.gaotao.modules.wms.data.InboundQcResultData;
import com.gaotao.modules.wms.data.PoOrderRollNoOutData;
@ -39,4 +40,6 @@ public interface WmsPrintDao {
List<PoOrderRollNoOutData> getPoPartLabelData(@Param("site")String site,@Param("buNo")String buNo,@Param("rollList") List<PoOrderRollNoOutData> inList);
IPage<InventoryStockOutData> getKuCunLabelData(Page<InventoryStockOutData> pageData, @Param("query") InventoryStockOutData data);
}

2
src/main/java/com/gaotao/modules/wms/service/WmsPrintService.java

@ -41,5 +41,5 @@ public interface WmsPrintService {
List<PoOrderRollNoOutData> getPoPartLabelData( List<PoOrderRollNoOutData> inList);
// PageUtils getKuCunLabelData(InventoryStockOutData inData);
PageUtils getKuCunLabelData(InventoryStockOutData inData);
}

7
src/main/java/com/gaotao/modules/wms/service/impl/WmsPrintServiceImpl.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gaotao.common.utils.DateUtils;
import com.gaotao.common.utils.PageUtils;
import com.gaotao.modules.inventoryStock.entity.InventoryStockOutData;
import com.gaotao.modules.pms.data.QcDetailReport;
import com.gaotao.modules.sys.entity.SysUserEntity;
import com.gaotao.modules.trans.entity.TransNoControl;
@ -114,5 +115,9 @@ public class WmsPrintServiceImpl implements WmsPrintService {
}
}
@Override
public PageUtils getKuCunLabelData(InventoryStockOutData inData){
IPage<InventoryStockOutData> list = this.wmsPrintDao.getKuCunLabelData(new Page<InventoryStockOutData>(inData.getPage(), inData.getLimit()), inData);
return new PageUtils(list);
}
}

45
src/main/resources/mapper/wms/WmsPrintMapper.xml

@ -112,4 +112,49 @@
</foreach>
order by created_date
</select>
<select id="getKuCunLabelData" resultType="InventoryStockOutData">
select a.site,a.bu_no,a.warehouse_id,location_id,roll_no,parent_roll_no,part_no,b.PartDescription,B.part_desc_en,a.status,a.qty_on_hand,label_type,a.orderref1,a.orderref2,a.orderref3,a.manufacture_date,a.expired_date,a.batch_no
from inventory_stock a
left join part b on a.site = b.site and a.bu_no = b.bu_no and a.part_no = b.PartNo
<where>
and a.status != '出库'
<if test="query.site != null and query.site != ''">
and A.site=#{query.site,jdbcType=VARCHAR}
</if>
<if test="query.buNo != null and query.buNo != ''">
and A.bu_no=#{query.buNo}
</if>
<if test="query.warehouseId != null and query.warehouseId != ''">
and A.warehouse_id like '%'+ #{query.warehouseId}+'%'
</if>
<if test="query.locationId != null and query.locationId != ''">
and A.location_id like '%'+ #{query.locationId}+'%'
</if>
<if test="query.rollNo != null and query.rollNo != ''">
and A.roll_no like '%'+ #{query.rollNo}+'%'
</if>
<if test="query.parentRollNo != null and query.parentRollNo != ''">
and A.parent_roll_no like '%'+ #{query.parentRollNo}+'%'
</if>
<if test="query.partNo != null and query.partNo != ''">
and A.part_no like '%'+ #{query.partNo}+'%'
</if>
<if test="query.partDescription != null and query.partDescription != ''">
and b.part_desc_en like '%'+ #{query.partDescEn}+'%'
</if>
<if test="query.status != null and query.status != ''">
and a.status = #{query.status}
</if>
<if test="query.labelType != null and query.labelType != ''">
and a.label_type = #{query.labelType}
</if>
<if test="query.batchNo != null and query.batchNo != ''">
and a.batch_no like '%'+ #{query.batchNo}+'%'
</if>
</where>
</select>
</mapper>
Loading…
Cancel
Save