Browse Source

2025.5.9 新增界面打印库存标签(ALL) 功能主要解决库存为0时无法进行打印的问题

master
jiayang yue 1 year ago
parent
commit
45e06ffad5
  1. 15
      src/main/java/com/heai/modules/production/controller/DailyPlanController.java
  2. 1
      src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
  3. 2
      src/main/java/com/heai/modules/production/service/DailyPlanService.java
  4. 5
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  5. 46
      src/main/resources/mapper/production/DailyPlanMapper.xml

15
src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@ -656,6 +656,21 @@ public class DailyPlanController {
return R.ok().put("rows", resultList).put("total",resultList.size());
}
/**
* @Description TODO
* @Title getStockPrintAll
* @param inData
* @author yjy
* @date 2025/5/09 14:47
* @return R
* @throw
*/
@PostMapping("/getStockPrintAll")
public R getStockPrintAll(@RequestBody StockPrintInData inData){
List<StockPrintData> resultList = dailyPlanService.getStockPrintAll(inData);
return R.ok().put("rows", resultList).put("total",resultList.size());
}
/**
* @Description 扫描派工单获取数据
* @Title getStockPrint

1
src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@ -377,6 +377,7 @@ public interface DailyPlanMapper {
* @throw
*/
List<StockPrintData> getStockPrint(StockPrintInData inData);
List<StockPrintData> getStockPrintAll(StockPrintInData inData);
List<SOScheduledRoutingOutData> checkUserSeqNo(@Param("seqNo")Integer seqNo,@Param("userId")String userId);
List<SORoutingData> checkLastItemReport(SOScheduledRoutingOutData inData);
/**

2
src/main/java/com/heai/modules/production/service/DailyPlanService.java

@ -482,6 +482,8 @@ public interface DailyPlanService {
*/
List<StockPrintData> getStockPrint(StockPrintInData inData);
List<StockPrintData> getStockPrintAll(StockPrintInData inData);
/**
* @Description 扫描派工单获取数据
* @Title searchSeqNo

5
src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@ -1306,6 +1306,11 @@ public class DailyPlanServiceImpl implements DailyPlanService {
return dailyPlanMapper.getStockPrint(inData);
}
@Override
public List<StockPrintData> getStockPrintAll(StockPrintInData inData){
return dailyPlanMapper.getStockPrintAll(inData);
}
@Override
public SOScheduledRoutingOutData searchSeqNo(SOScheduledRoutingOutData inData){

46
src/main/resources/mapper/production/DailyPlanMapper.xml

@ -827,6 +827,52 @@
order by a.TransDate desc
</select>
<select id="getStockPrintAll" resultType="com.heai.modules.production.entity.StockPrintData">
select 'N/A' as TransNo
, a.Site
, a.WareHouseId
, a.BatchNo
, a.LocationId
, a.PartNo
, 'N/A' as OrderNo
, a.FirstInDate as TransDate
, Round(a.QtyOnHand, 3) as Qty
, 'N' as PrintFlag
, dbo.Get_PartDesc(a.Site, a.PartNo) as partDesc
, Round(dbo.Get_Part_NetWeight(a.Site, a.PartNo) * isnull(Round(a.QtyOnHand, 3), 0) / 1000, 2) weight
, dbo.Get_WareHouseDesc(a.Site, a.WareHouseId) as wareHouseDesc
, dbo.Get_Part_UMID(a.Site, a.PartNo) umid
, a.ExpiredDate as expiredDate
, dbo.Get_StorePrintPartStatus(a.Site, a.PartNo, a.BatchNo) status
, isnull(Round(a.QtyOnHand, 3), 0) QtyOnHand
from InventoryStock a
<where>
Round(a.QtyOnHand, 3) > 0
<if test="startDate != null ">
and a.TransDate >= #{startDate}
</if>
<if test="endDate != null ">
and #{endDate} >= a.TransDate -1
</if>
<if test="site != null and site != ''">
AND a.site = #{site}
</if>
<if test="orderNo != null and orderNo != ''">
AND a.orderNo LIKE #{orderNo}
</if>
<if test="seqNo != null and seqNo != ''">
AND a.seqNo = #{seqNo}
</if>
<if test="batchNo != null and batchNo != ''">
AND a.BatchNo LIKE #{batchNo}
</if>
<if test="partNo != null and partNo != ''">
AND a.PartNo LIKE #{partNo}
</if>
</where>
order by a.TransDate desc
</select>
<update id="updatePrintStock">
update StockPrint set PrintFlag='Y' where Site=#{site} and TransNo=#{transNo}
</update>

Loading…
Cancel
Save