Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
8c7ff0c8 由 康伟
选项

kangwei:

1 个父辈 07f7f628
内嵌 并排
正在显示 6 个修改的文件 包含 72 行增加 和 6 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/vo/AjhPlanScheduleConfigTreeVO.java 0 → 100644
1 package com.skua.modules.ajh.vo;
2
3 /**
4 * @auther kangwei
5 * @create 2025-02-28-13:56
6 */
7 public class AjhPlanScheduleConfigTreeVO {
8 }
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
...@@ -174,16 +174,25 @@ public class MaterialINController { ...@@ -174,16 +174,25 @@ public class MaterialINController {
174 @AutoLog(value = "erp--物料(药剂)入库--药剂到货日验收记录") 174 @AutoLog(value = "erp--物料(药剂)入库--药剂到货日验收记录")
175 @ApiOperation(value="erp--物料(药剂)入库-药剂到货日验收记录", notes="erp--物料(药剂)入库-药剂到货日验收记录") 175 @ApiOperation(value="erp--物料(药剂)入库-药剂到货日验收记录", notes="erp--物料(药剂)入库-药剂到货日验收记录")
176 @GetMapping(value = "/arrivalRecordList") 176 @GetMapping(value = "/arrivalRecordList")
177 public Result<IPage<MaterialIN>> arrivalRecordList(MaterialIN materialIN, 177 public Result<IPage<MaterialINVO>> arrivalRecordList(MaterialINVO materialINVO,
178 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 178 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
179 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 179 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
180 HttpServletRequest req) { 180 HttpServletRequest req) {
181 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>(); 181 Result<IPage<MaterialINVO>> result = new Result<IPage<MaterialINVO>>();
182 QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap()); 182 /*QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
183 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize); 183
184 queryWrapper.eq("audit_status","3");//审批通过 184 queryWrapper.eq("audit_status","3");//审批通过
185 queryWrapper.orderByDesc("arrive_time"); 185 queryWrapper.orderByDesc("arrive_time");
186 IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper); 186 IPage<MaterialINVO> pageList = materialINService.page(page, queryWrapper);*/
187 Page<MaterialINVO> page = new Page<MaterialINVO>(pageNo, pageSize);
188 if(StringUtils.isNotEmpty(req.getParameter("arriveTime_begin"))){
189 materialINVO.setStartTime( req.getParameter("arriveTime_begin") );
190 }
191 if(StringUtils.isNotEmpty(req.getParameter("arriveTime_end"))){
192 materialINVO.setEndTime( req.getParameter("arriveTime_end") );
193 }
194 materialINVO.setAuditStatus("3");
195 IPage<MaterialINVO> pageList = materialINService.arrivalRecordList(page, materialINVO);
187 result.setSuccess(true); 196 result.setSuccess(true);
188 result.setResult(pageList); 197 result.setResult(pageList);
189 return result; 198 return result;
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/MaterialINMapper.java
...@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper; ...@@ -3,6 +3,7 @@ package com.skua.modules.erp.mapper;
3 import java.util.List; 3 import java.util.List;
4 4
5 import com.baomidou.mybatisplus.core.metadata.IPage; 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO; 7 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
7 import com.skua.modules.erp.vo.MaterialINVO; 8 import com.skua.modules.erp.vo.MaterialINVO;
8 import com.skua.tool.annotation.Anonymous; 9 import com.skua.tool.annotation.Anonymous;
...@@ -30,6 +31,7 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> { ...@@ -30,6 +31,7 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> {
30 */ 31 */
31 List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN); 32 List<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, @Param("materialIN") MaterialIN materialIN);
32 33
34 List<MaterialINVO> arrivalRecordList(Page<MaterialINVO> page, @Param("param")MaterialINVO materialINVO);
33 @Anonymous 35 @Anonymous
34 MaterialINVO queryById(@Param("id") String id); 36 MaterialINVO queryById(@Param("id") String id);
35 37
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
...@@ -62,16 +62,55 @@ ...@@ -62,16 +62,55 @@
62 62
63 <select id="queryById" resultType="com.skua.modules.erp.vo.MaterialINVO"> 63 <select id="queryById" resultType="com.skua.modules.erp.vo.MaterialINVO">
64 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, 64 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,
65 dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,t.distribut_total_price , t.distribut_total_price 'total_price', 65 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',
66 dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,
66 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 67 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
67 from erp_material_in t 68 from erp_material_in t
68 left join sys_depart d on t.depart_id = d.id 69 left join sys_depart d on t.depart_id = d.id
70 left join erp_purchase_material pm on pm.good_code = t.good_code
69 left join equipment_sparepart_supplies ss on t.sparepart_id = ss.id 71 left join equipment_sparepart_supplies ss on t.sparepart_id = ss.id
70 left join equipment_sparepart_type st on st.id = t.sparepart_type 72 left join equipment_sparepart_type st on st.id = t.sparepart_type
71 left join ajh_supplier_manage sm on sm.id = t.supplier_id 73 left join ajh_supplier_manage sm on sm.id = t.supplier_id
72 left join erp_distribut_material dm on (dm.contract_id = t.distribut_contract_id and dm.good_code = t.good_code) 74 left join erp_distribut_material dm on (dm.contract_id = t.distribut_contract_id and dm.good_code = t.good_code)
73 where t.id = #{id} 75 where t.id = #{id}
74 </select> 76 </select>
77
78
79 <select id="arrivalRecordList" resultType="com.skua.modules.erp.vo.MaterialINVO">
80 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,
81 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',
82 dm.tax_amount,dm.distribut_price,t.distribut_material_id,t.sparepart_type,
83 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
84 from erp_material_in t
85 left join sys_depart d on t.depart_id = d.id
86 left join erp_purchase_material pm on pm.good_code = t.good_code
87 left join equipment_sparepart_supplies ss on t.sparepart_id = ss.id
88 left join equipment_sparepart_type st on st.id = t.sparepart_type
89 left join ajh_supplier_manage sm on sm.id = t.supplier_id
90 left join erp_distribut_material dm on (dm.contract_id = t.distribut_contract_id and dm.good_code = t.good_code)
91 where t.audit_status = #{param.auditStatus}
92 <if test="param.departId != null and param.departId != ''">
93 and t.depart_id = #{param.departId}
94 </if>
95 <if test="param.goodCode != null and param.goodCode != ''">
96 AND t.good_code like concat('%', #{param.goodCode}, '%')
97 </if>
98 <if test="param.startTime != null and param.startTime !='' ">
99 and t.arrive_time &gt;= #{param.startTime}
100 </if>
101 <if test="param.endTime != null and param.endTime != '' ">
102 and t.arrive_time &lt;= #{param.endTime}
103 </if>
104
105 <if test="param.supplierId != null and param.supplierId != ''">
106 and t.supplier_id = #{param.supplierId}
107 </if>
108
109 <if test="param.sparepartName != null and param.sparepartName != ''">
110 and ss.sparepart_name like concat('%', #{param.sparepartName}, '%')
111 </if>
112 order by t.arrive_time desc
113 </select>
75 <!-- 批量送审--> 114 <!-- 批量送审-->
76 <update id="batchSendAudit" > 115 <update id="batchSendAudit" >
77 update erp_material_in set audit_status = #{auditStatus} where id in (${ids}) and audit_status = '0' 116 update erp_material_in set audit_status = #{auditStatus} where id in (${ids}) and audit_status = '0'
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IMaterialINService.java
1 package com.skua.modules.erp.service; 1 package com.skua.modules.erp.service;
2 2
3 import com.baomidou.mybatisplus.core.metadata.IPage; 3 import com.baomidou.mybatisplus.core.metadata.IPage;
4 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4 import com.skua.modules.erp.entity.MaterialIN; 5 import com.skua.modules.erp.entity.MaterialIN;
5 import com.baomidou.mybatisplus.extension.service.IService; 6 import com.baomidou.mybatisplus.extension.service.IService;
6 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO; 7 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
...@@ -34,6 +35,7 @@ public interface IMaterialINService extends IService<MaterialIN> { ...@@ -34,6 +35,7 @@ public interface IMaterialINService extends IService<MaterialIN> {
34 */ 35 */
35 public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) ; 36 public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) ;
36 37
38 IPage<MaterialINVO> arrivalRecordList(Page<MaterialINVO> page, MaterialINVO materialINVO);
37 /*** 39 /***
38 * 药剂入库 40 * 药剂入库
39 * @param materialINVO 41 * @param materialINVO
...@@ -70,4 +72,6 @@ public interface IMaterialINService extends IService<MaterialIN> { ...@@ -70,4 +72,6 @@ public interface IMaterialINService extends IService<MaterialIN> {
70 * @param materialIN 72 * @param materialIN
71 */ 73 */
72 void sendAudit(MaterialIN materialIN); 74 void sendAudit(MaterialIN materialIN);
75
76
73 } 77 }
......
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; ...@@ -3,6 +3,7 @@ package com.skua.modules.erp.service.impl;
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 import com.baomidou.mybatisplus.core.metadata.IPage; 5 import com.baomidou.mybatisplus.core.metadata.IPage;
6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 import com.skua.core.context.BaseContextHandler; 7 import com.skua.core.context.BaseContextHandler;
7 import com.skua.core.context.SpringContextUtils; 8 import com.skua.core.context.SpringContextUtils;
8 import com.skua.core.util.ConvertUtils; 9 import com.skua.core.util.ConvertUtils;
...@@ -198,6 +199,9 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia ...@@ -198,6 +199,9 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
198 public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) { 199 public IPage<MaterialIN> selectAuditMaterialINByPage(IPage<MaterialIN> page, MaterialIN materialIN) {
199 return page.setRecords(baseMapper.selectAuditMaterialINByPage(page, materialIN)); 200 return page.setRecords(baseMapper.selectAuditMaterialINByPage(page, materialIN));
200 } 201 }
202 public IPage<MaterialINVO> arrivalRecordList(Page<MaterialINVO> page, MaterialINVO materialINVO){
203 return page.setRecords(baseMapper.arrivalRecordList(page, materialINVO));
204 }
201 /*** 205 /***
202 * 药剂入库 206 * 药剂入库
203 * @param materialINVO 207 * @param materialINVO
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!