This commit is contained in:
God
2024-10-21 14:37:57 +08:00
parent 9823ffc065
commit 5d613b0a61
5 changed files with 45 additions and 0 deletions

View File

@@ -5,6 +5,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseansbill.*; import com.yxt.warehouse.biz.warehouseansbill.*;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillNum;
import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordsExcelVo; import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordsExcelVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -93,4 +94,10 @@ public class WarehouseAnsBillRest {
public ResultBean updateRemarks(@RequestBody WarehouseAnsBillDto dto) { public ResultBean updateRemarks(@RequestBody WarehouseAnsBillDto dto) {
return wmsAnsBillService.updateRemarks(dto); return wmsAnsBillService.updateRemarks(dto);
} }
@GetMapping("selByExternalNo")
@ApiOperation("根据外部单号查询实际入库数量及单价")
ResultBean<WarehouseAnsBillNum> selByExternalNo(@RequestParam("billNo") String billNo){
return wmsAnsBillService.selByExternalNo(billNo);
}
} }

View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetail; import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetail;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo; import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillNum;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -29,4 +30,6 @@ public interface WarehouseAnsBillMapper extends BaseMapper<WarehouseAnsBill> {
WarehouseAnsDetailsVo details(String sid); WarehouseAnsDetailsVo details(String sid);
String selectNum(String billNo); String selectNum(String billNo);
WarehouseAnsBillNum selByExternalNo(String billNo);
} }

View File

@@ -114,4 +114,15 @@
order by billNo desc order by billNo desc
limit 1 limit 1
</select> </select>
<select id="selByExternalNo" resultType="com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillNum">
SELECT
SUM(wd.`actualInCount`) AS actualInCount,
price
FROM
warehouse_ans_bill_detail wd
LEFT JOIN warehouse_ans_bill wb
ON wd.`sourceBillSid` = wb.`sid`
WHERE wb.`sourceBillNo` = #{billNo}
</select>
</mapper> </mapper>

View File

@@ -405,4 +405,10 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
operationRecordService.save(dto1); operationRecordService.save(dto1);
return rb.success().setData("成功"); return rb.success().setData("成功");
} }
public ResultBean<WarehouseAnsBillNum> selByExternalNo(String billNo) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBillNum warehouseAnsBillNum = baseMapper.selByExternalNo(billNo);
return rb.success().setData(warehouseAnsBillNum);
}
} }

View File

@@ -0,0 +1,18 @@
package com.yxt.warehouse.biz.warehouseansbilldetail;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/11
**/
@Data
public class WarehouseAnsBillNum {
private BigDecimal actualInCount;
private BigDecimal price;
}