diff --git a/sk-module-biz/src/main/java/com/skua/modules/ajh/vo/AjhPlanScheduleConfigTreeVO.java b/sk-module-biz/src/main/java/com/skua/modules/ajh/vo/AjhPlanScheduleConfigTreeVO.java
new file mode 100644
index 0000000..871da95
--- /dev/null
+++ b/sk-module-biz/src/main/java/com/skua/modules/ajh/vo/AjhPlanScheduleConfigTreeVO.java
@@ -0,0 +1,8 @@
+package com.skua.modules.ajh.vo;
+
+/**
+ * @auther kangwei
+ * @create 2025-02-28-13:56
+ */
+public class AjhPlanScheduleConfigTreeVO {
+}
diff --git a/sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java b/sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
index 848b8db..36e2822 100644
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
@@ -174,16 +174,25 @@ public class MaterialINController {
@AutoLog(value = "erp--物料(药剂)入库--药剂到货日验收记录")
@ApiOperation(value="erp--物料(药剂)入库-药剂到货日验收记录", notes="erp--物料(药剂)入库-药剂到货日验收记录")
@GetMapping(value = "/arrivalRecordList")
- public Result<IPage<MaterialIN>> arrivalRecordList(MaterialIN materialIN,
+ public Result<IPage<MaterialINVO>> arrivalRecordList(MaterialINVO materialINVO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>();
- QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
- Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize);
+ Result<IPage<MaterialINVO>> result = new Result<IPage<MaterialINVO>>();
+ /*QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
+
queryWrapper.eq("audit_status","3");//审批通过
queryWrapper.orderByDesc("arrive_time");
- IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper);
+ IPage<MaterialINVO> pageList = materialINService.page(page, queryWrapper);*/
+ Page<MaterialINVO> page = new Page<MaterialINVO>(pageNo, pageSize);
+ if(StringUtils.isNotEmpty(req.getParameter("arriveTime_begin"))){
+ materialINVO.setStartTime( req.getParameter("arriveTime_begin") );
+ }
+ if(StringUtils.isNotEmpty(req.getParameter("arriveTime_end"))){
+ materialINVO.setEndTime( req.getParameter("arriveTime_end") );
+ }
+ materialINVO.setAuditStatus("3");
+ IPage<MaterialINVO> pageList = materialINService.arrivalRecordList(page, materialINVO);
result.setSuccess(true);
result.setResult(pageList);
return result;
diff --git a/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialINMapper.java b/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialINMapper.java
index c88355e..2e8226a 100644
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialINMapper.java
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialINMapper.java
@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
import com.skua.modules.erp.vo.MaterialINVO;
import com.skua.tool.annotation.Anonymous;
@@ -30,6 +31,7 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> {
*/
List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN);
+ List<MaterialINVO> arrivalRecordList(Page<MaterialINVO> page, @Param("param")MaterialINVO materialINVO);
@Anonymous
MaterialINVO queryById(@Param("id") String id);
diff --git a/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml b/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
index 61859dd..7fa0f82 100644
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
@@ -62,16 +62,55 @@
<select id="queryById" resultType="com.skua.modules.erp.vo.MaterialINVO">
select d.depart_name 'departName', ss.sparepart_code,ss.sparepart_name, st.item_text as 'sparepart_type_name',sm.supp_name as 'supplier_name',ss.sparepart_name, ss.specification,ss.measuring_unit,
- dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,t.distribut_total_price , t.distribut_total_price 'total_price',
+ round(pm.unit_price * t.material_num,2) 'purchaseTotalPrice', round(dm.distribut_price * t.material_num,2) 'distributTotalPrice' ,round(dm.distribut_price * t.material_num ,2)'total_price',
+ dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,
t.id,t.depart_id,t.project_name,t.in_order,t.purchase_contract_id,t.purchase_contract_code,t.distribut_contract_id,t.distribut_contract_code,t.arrive_time,t.receiver,t.sparepart_id,t.material_num,t.supplier_id,t.good_code,t.share_url,t.confirm_status,t.audit_status,t.approve_message,t.in_type
from erp_material_in t
left join sys_depart d on t.depart_id = d.id
+ left join erp_purchase_material pm on pm.good_code = t.good_code
left join equipment_sparepart_supplies ss on t.sparepart_id = ss.id
left join equipment_sparepart_type st on st.id = t.sparepart_type
left join ajh_supplier_manage sm on sm.id = t.supplier_id
left join erp_distribut_material dm on (dm.contract_id = t.distribut_contract_id and dm.good_code = t.good_code)
where t.id = #{id}
</select>
+
+
+ <select id="arrivalRecordList" resultType="com.skua.modules.erp.vo.MaterialINVO">
+ select d.depart_name 'departName', ss.sparepart_code,ss.sparepart_name, st.item_text as 'sparepart_type_name',sm.supp_name as 'supplier_name',ss.sparepart_name, ss.specification,ss.measuring_unit,
+ round(pm.unit_price * t.material_num,2) 'purchaseTotalPrice', round(dm.distribut_price * t.material_num,2) 'distributTotalPrice' ,round(dm.distribut_price * t.material_num ,2)'total_price',
+ dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,
+ t.id,t.depart_id,t.project_name,t.in_order,t.purchase_contract_id,t.purchase_contract_code,t.distribut_contract_id,t.distribut_contract_code,t.arrive_time,t.receiver,t.sparepart_id,t.material_num,t.supplier_id,t.good_code,t.share_url,t.confirm_status,t.audit_status,t.approve_message,t.in_type
+ from erp_material_in t
+ left join sys_depart d on t.depart_id = d.id
+ left join erp_purchase_material pm on pm.good_code = t.good_code
+ left join equipment_sparepart_supplies ss on t.sparepart_id = ss.id
+ left join equipment_sparepart_type st on st.id = t.sparepart_type
+ left join ajh_supplier_manage sm on sm.id = t.supplier_id
+ left join erp_distribut_material dm on (dm.contract_id = t.distribut_contract_id and dm.good_code = t.good_code)
+ where t.audit_status = #{param.auditStatus}
+ <if test="param.departId != null and param.departId != ''">
+ and t.depart_id = #{param.departId}
+ </if>
+ <if test="param.goodCode != null and param.goodCode != ''">
+ AND t.good_code like concat('%', #{param.goodCode}, '%')
+ </if>
+ <if test="param.startTime != null and param.startTime !='' ">
+ and t.arrive_time >= #{param.startTime}
+ </if>
+ <if test="param.endTime != null and param.endTime != '' ">
+ and t.arrive_time <= #{param.endTime}
+ </if>
+
+ <if test="param.supplierId != null and param.supplierId != ''">
+ and t.supplier_id = #{param.supplierId}
+ </if>
+
+ <if test="param.sparepartName != null and param.sparepartName != ''">
+ and ss.sparepart_name like concat('%', #{param.sparepartName}, '%')
+ </if>
+ order by t.arrive_time desc
+ </select>
<!-- 批量送审-->
<update id="batchSendAudit" >
update erp_material_in set audit_status = #{auditStatus} where id in (${ids}) and audit_status = '0'
diff --git a/sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialINService.java b/sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialINService.java
index 7e78478..0cf1cbf 100644
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialINService.java
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialINService.java
@@ -1,6 +1,7 @@
package com.skua.modules.erp.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.erp.entity.MaterialIN;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
@@ -34,6 +35,7 @@ public interface IMaterialINService extends IService<MaterialIN> {
*/
public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) ;
+ IPage<MaterialINVO> arrivalRecordList(Page<MaterialINVO> page, MaterialINVO materialINVO);
/***
* 药剂入库
* @param materialINVO
@@ -70,4 +72,6 @@ public interface IMaterialINService extends IService<MaterialIN> {
* @param materialIN
*/
void sendAudit(MaterialIN materialIN);
+
+
}
diff --git a/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java b/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
index 566ab59..5e83703 100644
--- a/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
+++ b/sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/MaterialINServiceImpl.java
@@ -3,6 +3,7 @@ package com.skua.modules.erp.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.ConvertUtils;
@@ -198,6 +199,9 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) {
return page.setRecords(baseMapper.selectAuditMaterialINByPage(page, materialIN));
}
+ public IPage<MaterialINVO> arrivalRecordList(Page<MaterialINVO> page, MaterialINVO materialINVO){
+ return page.setRecords(baseMapper.arrivalRecordList(page, materialINVO));
+ }
/***
* 药剂入库
* @param materialINVO