Skip to content

张雷 / skboot-zhongye

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

kangwei: 修改药剂结算，税率不显示问题， 

          修改药剂审核导出，药剂入库导出问题
1 个父辈 1ac4b16f
内嵌 并排
正在显示 9 个修改的文件 包含 55 行增加 和 64 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
...@@ -64,6 +64,9 @@ public class ErpSettlementController { ...@@ -64,6 +64,9 @@ public class ErpSettlementController {
64 if(StringUtils.isNotEmpty(erpSettlementSearchVO.getSupplierId())){ 64 if(StringUtils.isNotEmpty(erpSettlementSearchVO.getSupplierId())){
65 queryWrapper.eq("supplier_id" ,erpSettlementSearchVO.getSupplierId()) ; 65 queryWrapper.eq("supplier_id" ,erpSettlementSearchVO.getSupplierId()) ;
66 } 66 }
67 //结算类型
68 queryWrapper.eq("settlement_type" ,erpSettlementSearchVO.getSettlementType()) ;
69
67 String startDate = req.getParameter("startDate"); 70 String startDate = req.getParameter("startDate");
68 if(StringUtils.isNotEmpty(startDate)){ 71 if(StringUtils.isNotEmpty(startDate)){
69 startDate = startDate+" 00:00:00"; 72 startDate = startDate+" 00:00:00";
...@@ -115,6 +118,8 @@ public class ErpSettlementController { ...@@ -115,6 +118,8 @@ public class ErpSettlementController {
115 if(erpSettlementItemList != null && !erpSettlementItemList.isEmpty()){ 118 if(erpSettlementItemList != null && !erpSettlementItemList.isEmpty()){
116 erpSettlementVO.setItemList( erpSettlementItemList ); 119 erpSettlementVO.setItemList( erpSettlementItemList );
117 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(erpSettlementItemList) ); 120 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(erpSettlementItemList) );
121 // 计算总价、总数、价税合计
122 erpSettlementVO.calculatePrice();
118 result.setResult(erpSettlementVO); 123 result.setResult(erpSettlementVO);
119 result.setSuccess(true); 124 result.setSuccess(true);
120 }else{ 125 }else{
...@@ -162,6 +167,9 @@ public class ErpSettlementController { ...@@ -162,6 +167,9 @@ public class ErpSettlementController {
162 erpSettlementVO.setItemList(settlementItemList ); 167 erpSettlementVO.setItemList(settlementItemList );
163 //送货单以及物资验收单 168 //送货单以及物资验收单
164 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(settlementItemList) ); 169 erpSettlementVO.setSparepartSettlementList( converErpSettlementItemList(settlementItemList) );
170
171 // 计算总价、总数、价税合计
172 erpSettlementVO.calculatePrice();
165 result.setResult(erpSettlementVO); 173 result.setResult(erpSettlementVO);
166 result.setSuccess(true); 174 result.setSuccess(true);
167 }else{ 175 }else{
...@@ -369,19 +377,10 @@ public class ErpSettlementController { ...@@ -369,19 +377,10 @@ public class ErpSettlementController {
369 }*/ 377 }*/
370 378
371 @RequestMapping(value = "/exportXls") 379 @RequestMapping(value = "/exportXls")
372 public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { 380 public ModelAndView exportXls(ErpSettlement erpSettlement,HttpServletRequest request, HttpServletResponse response) {
373 // Step.1 组装查询条件 381 // Step.1 组装查询条件
374 QueryWrapper<ErpSettlement> queryWrapper = null; 382 QueryWrapper<ErpSettlement> queryWrapper = null;
375 try { 383 queryWrapper = QueryGenerator.initQueryWrapper(erpSettlement, request.getParameterMap());
376 String paramsStr = request.getParameter("paramsStr");
377 if (ConvertUtils.isNotEmpty(paramsStr)) {
378 String deString = URLDecoder.decode(paramsStr, "UTF-8");
379 ErpSettlement erpSettlement = JSON.parseObject(deString, ErpSettlement.class);
380 queryWrapper = QueryGenerator.initQueryWrapper(erpSettlement, request.getParameterMap());
381 }
382 } catch (UnsupportedEncodingException e) {
383 e.printStackTrace();
384 }
385 384
386 //Step.2 AutoPoi 导出Excel 385 //Step.2 AutoPoi 导出Excel
387 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); 386 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
...@@ -358,22 +358,10 @@ public class MaterialINController { ...@@ -358,22 +358,10 @@ public class MaterialINController {
358 * @Description: TODO(这里描述这个方法的需求变更情况) 358 * @Description: TODO(这里描述这个方法的需求变更情况)
359 */ 359 */
360 @RequestMapping(value = "/exportXls") 360 @RequestMapping(value = "/exportXls")
361 public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { 361 public ModelAndView exportXls(MaterialIN materialIN,HttpServletRequest request, HttpServletResponse response) {
362 // Step.1 组装查询条件 362 // Step.1 组装查询条件
363 QueryWrapper<MaterialIN> queryWrapper = null; 363 QueryWrapper<MaterialIN> queryWrapper = null;
364 try { 364 queryWrapper = QueryGenerator.initQueryWrapper(materialIN, request.getParameterMap());
365 String paramsStr = request.getParameter("paramsStr");
366 if (ConvertUtils.isNotEmpty(paramsStr)) {
367 String deString = URLDecoder.decode(paramsStr, "UTF-8");
368 MaterialIN materialIN = JSON.parseObject(deString, MaterialIN.class);
369 queryWrapper = QueryGenerator.initQueryWrapper(materialIN, request.getParameterMap());
370 }
371 } catch (UnsupportedEncodingException e) {
372 e.printStackTrace();
373 }
374 if(queryWrapper == null ){
375 queryWrapper = new QueryWrapper();
376 }
377 //到货时间排序 365 //到货时间排序
378 queryWrapper.orderByDesc("arrive_time"); 366 queryWrapper.orderByDesc("arrive_time");
379 //Step.2 AutoPoi 导出Excel 367 //Step.2 AutoPoi 导出Excel
...@@ -388,25 +376,12 @@ public class MaterialINController { ...@@ -388,25 +376,12 @@ public class MaterialINController {
388 } 376 }
389 //导出到货记录 377 //导出到货记录
390 @RequestMapping(value = "/exportArrivalRecord") 378 @RequestMapping(value = "/exportArrivalRecord")
391 public ModelAndView exportArrivalRecord(HttpServletRequest request, HttpServletResponse response) { 379 public ModelAndView exportArrivalRecord(MaterialIN materialIN,HttpServletRequest request, HttpServletResponse response) {
392 // Step.1 组装查询条件 380 // Step.1 组装查询条件
393 QueryWrapper<MaterialIN> queryWrapper = null; 381 QueryWrapper<MaterialIN> queryWrapper = null;
394 try { 382 queryWrapper = QueryGenerator.initQueryWrapper(materialIN, request.getParameterMap());
395 String paramsStr = request.getParameter("paramsStr");
396 if (ConvertUtils.isNotEmpty(paramsStr)) {
397 String deString = URLDecoder.decode(paramsStr, "UTF-8");
398 MaterialIN materialIN = JSON.parseObject(deString, MaterialIN.class);
399 queryWrapper = QueryGenerator.initQueryWrapper(materialIN, request.getParameterMap());
400
401 }
402 } catch (UnsupportedEncodingException e) {
403 e.printStackTrace();
404 }
405 if(queryWrapper == null ){
406 queryWrapper = new QueryWrapper();
407 }
408 //全部确认的数据 383 //全部确认的数据
409 queryWrapper.eq("confirm_status","9"); 384 //queryWrapper.eq("confirm_status","9");
410 queryWrapper.eq("audit_status","3"); 385 queryWrapper.eq("audit_status","3");
411 queryWrapper.orderByDesc("arrive_time"); 386 queryWrapper.orderByDesc("arrive_time");
412 387
...@@ -419,10 +394,10 @@ public class MaterialINController { ...@@ -419,10 +394,10 @@ public class MaterialINController {
419 394
420 int index = 1; 395 int index = 1;
421 if(materialINList != null && !materialINList.isEmpty()){ 396 if(materialINList != null && !materialINList.isEmpty()){
422 for(MaterialIN materialIN : materialINList){ 397 for(MaterialIN materialINTemp : materialINList){
423 arrivalRecordVO = new MaterialINArrivalRecordVO(); 398 arrivalRecordVO = new MaterialINArrivalRecordVO();
424 //BeanUtils.copyProperties(有值的对象, 要被赋值的对象); 399 //BeanUtils.copyProperties(有值的对象, 要被赋值的对象);
425 BeanUtils.copyProperties(materialIN, arrivalRecordVO); 400 BeanUtils.copyProperties(materialINTemp, arrivalRecordVO);
426 arrivalRecordVO.setIndex( index++); 401 arrivalRecordVO.setIndex( index++);
427 dataList.add( arrivalRecordVO ) ; 402 dataList.add( arrivalRecordVO ) ;
428 } 403 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpSettlement.java
...@@ -42,12 +42,6 @@ public class ErpSettlement { ...@@ -42,12 +42,6 @@ public class ErpSettlement {
42 @ApiModelProperty(value = "水厂编号") 42 @ApiModelProperty(value = "水厂编号")
43 @Dict(dictTable="sys_depart",dicCode = "id",dicText = "depart_name") 43 @Dict(dictTable="sys_depart",dicCode = "id",dicText = "depart_name")
44 private String departId; 44 private String departId;
45 /**采购合同*/
46 @ApiModelProperty(value = "采购合同")
47 private String purchaseContractId;
48 /**分销合同*/
49 @ApiModelProperty(value = "分销合同")
50 private String distributContractId;
51 45
52 /**合同编号*/ 46 /**合同编号*/
53 @ApiModelProperty(value = "合同编号") 47 @ApiModelProperty(value = "合同编号")
...@@ -61,10 +55,7 @@ public class ErpSettlement { ...@@ -61,10 +55,7 @@ public class ErpSettlement {
61 @Excel(name = "结算金额", width = 15) 55 @Excel(name = "结算金额", width = 15)
62 @ApiModelProperty(value = "结算金额") 56 @ApiModelProperty(value = "结算金额")
63 private String totalPrice; 57 private String totalPrice;
64 /**税额*/ 58
65 @Excel(name = "税额", width = 15)
66 @ApiModelProperty(value = "税额")
67 private String taxAmount;
68 /**价税合计*/ 59 /**价税合计*/
69 @Excel(name = "总价不含税", width = 15) 60 @Excel(name = "总价不含税", width = 15)
70 @ApiModelProperty(value = "总价不含税") 61 @ApiModelProperty(value = "总价不含税")
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpSettlementItem.java
1 package com.skua.modules.erp.entity; 1 package com.skua.modules.erp.entity;
2 2
3 import java.io.Serializable; 3
4 import java.util.Date;
5 import com.baomidou.mybatisplus.annotation.IdType; 4 import com.baomidou.mybatisplus.annotation.IdType;
6 import com.baomidou.mybatisplus.annotation.TableId; 5 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
8 import com.baomidou.mybatisplus.annotation.TableField;
9 import com.skua.core.aspect.annotation.Dict; 7 import com.skua.core.aspect.annotation.Dict;
10 import io.swagger.annotations.ApiModel; 8 import io.swagger.annotations.ApiModel;
11 import io.swagger.annotations.ApiModelProperty; 9 import io.swagger.annotations.ApiModelProperty;
12 import lombok.Data; 10 import lombok.Data;
13 import lombok.EqualsAndHashCode; 11 import lombok.EqualsAndHashCode;
14 import lombok.experimental.Accessors; 12 import lombok.experimental.Accessors;
15 import com.fasterxml.jackson.annotation.JsonFormat;
16 import org.springframework.format.annotation.DateTimeFormat;
17 import org.jeecgframework.poi.excel.annotation.Excel; 13 import org.jeecgframework.poi.excel.annotation.Excel;
18 14
19 /** 15 /**
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/MaterialIN.java
...@@ -180,12 +180,12 @@ public class MaterialIN { ...@@ -180,12 +180,12 @@ public class MaterialIN {
180 @ApiModelProperty(value = "出库编号") 180 @ApiModelProperty(value = "出库编号")
181 private String equipmentOutId; 181 private String equipmentOutId;
182 182
183 @Excel(name = "供应商结算", width = 15) 183 @Excel(name = "供应商结算", width = 15,dicCode="settlement_status")
184 @ApiModelProperty(value = "供应商结算，0:申请,1::已申请，2：已结算") 184 @ApiModelProperty(value = "供应商结算，0:申请,1::已申请，2：已结算")
185 @Dict( dicCode="settlement_status") 185 @Dict( dicCode="settlement_status")
186 private Integer supplierSettlementFlag; 186 private Integer supplierSettlementFlag;
187 187
188 @Excel(name = "水厂结算", width = 15) 188 @Excel(name = "水厂结算", width = 15,dicCode="settlement_status")
189 @ApiModelProperty(value = "水厂结算，0:未申请,1:已申请，2：已结算") 189 @ApiModelProperty(value = "水厂结算，0:未申请,1:已申请，2：已结算")
190 @Dict( dicCode="settlement_status") 190 @Dict( dicCode="settlement_status")
191 private Integer waterDepartSettlementFlag; 191 private Integer waterDepartSettlementFlag;
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpSettlementMapper.xml
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 <!-- 根据入库单ids，获取水厂结算单详情--> 43 <!-- 根据入库单ids，获取水厂结算单详情-->
44 <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO"> 44 <select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
45 select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price' , pm.good_brand , pm.good_origin, mf.jishu_file_path, mf.appearance_info, mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign, dm.tax_amount , 45 select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price' , pm.good_brand , pm.good_origin, mf.jishu_file_path, mf.appearance_info, mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign, dm.tax_amount ,
46 round(dm.distribut_price * mi.material_num,2) total_price, round(pm.unit_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2) total_price_tax, 46 round(dm.distribut_price * mi.material_num,2) total_price, round(dm.distribut_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2) total_price_tax,
47 mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num, 47 mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
48 mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification, mi.measuring_unit,mi.good_code,mi.id 'material_in_id' 48 mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification, mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
49 from erp_material_in mi 49 from erp_material_in mi
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/ErpSettlementItemVO.java
1 package com.skua.modules.erp.vo; 1 package com.skua.modules.erp.vo;
2 2
3 import com.baomidou.mybatisplus.annotation.TableField;
4 import com.skua.modules.erp.entity.ErpSettlementItem; 3 import com.skua.modules.erp.entity.ErpSettlementItem;
5 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 5 import io.swagger.annotations.ApiModelProperty;
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/ErpSettlementSearchVO.java
...@@ -21,4 +21,7 @@ public class ErpSettlementSearchVO { ...@@ -21,4 +21,7 @@ public class ErpSettlementSearchVO {
21 21
22 @ApiModelProperty(value = "结束时间") 22 @ApiModelProperty(value = "结束时间")
23 private String endDate; 23 private String endDate;
24
25 @ApiModelProperty(value = "结算类型")
26 private String settlementType;
24 } 27 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/ErpSettlementVO.java
...@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName; ...@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
10 import com.baomidou.mybatisplus.annotation.TableField; 10 import com.baomidou.mybatisplus.annotation.TableField;
11 import com.skua.modules.erp.entity.ErpSettlement; 11 import com.skua.modules.erp.entity.ErpSettlement;
12 import com.skua.modules.erp.entity.ErpSettlementItem; 12 import com.skua.modules.erp.entity.ErpSettlementItem;
13 import com.skua.tool.util.JSUtils;
13 import io.swagger.annotations.ApiModel; 14 import io.swagger.annotations.ApiModel;
14 import io.swagger.annotations.ApiModelProperty; 15 import io.swagger.annotations.ApiModelProperty;
15 import lombok.Data; 16 import lombok.Data;
...@@ -34,12 +35,39 @@ public class ErpSettlementVO extends ErpSettlement { ...@@ -34,12 +35,39 @@ public class ErpSettlementVO extends ErpSettlement {
34 @ApiModelProperty(value = "部门名称") 35 @ApiModelProperty(value = "部门名称")
35 private String departName; 36 private String departName;
36 37
38 /*@ApiModelProperty(value = "数量")
39 private String materialNum;
40
41 @ApiModelProperty(value = "结算金额")
42 private String totalPrice;
43
44 @ApiModelProperty(value = "结算金额-不含税")
45 private String totalPriceTax;*/
46
37 @ApiModelProperty(value = "结算清单") 47 @ApiModelProperty(value = "结算清单")
38 private List<ErpSettlementItemVO> itemList ; 48 private List<ErpSettlementItemVO> itemList ;
39 49
40
41 @ApiModelProperty(value = "物料结算记录") 50 @ApiModelProperty(value = "物料结算记录")
42 private List<SparepartSettlementVO> sparepartSettlementList ; 51 private List<SparepartSettlementVO> sparepartSettlementList ;
43 52
44 53 /***
54 * 计算总数、总价、价税合计
55 */
56 public void calculatePrice(){
57 String materialNumExpression = "0";
58 String totalPriceExpression = "0";
59 String totalPriceTaxExpression ="0";
60 if(itemList != null && !itemList.isEmpty()){
61 for(ErpSettlementItemVO settlementItemVO : itemList){
62 materialNumExpression = materialNumExpression + "+" +settlementItemVO.getMaterialNum();
63 totalPriceExpression = totalPriceExpression + "+" +settlementItemVO.getTotalPrice();
64 totalPriceTaxExpression = totalPriceTaxExpression + "+" +settlementItemVO.getTotalPriceTax();
65 //totalPriceExpression = totalPriceExpression + "+ (" +settlementItemVO.getUnitPrice() +" * "+settlementItemVO.getMaterialNum()+")";
66 //totalPriceTaxExpression = totalPriceTaxExpression + "+ (" +settlementItemVO.getUnitPrice() +" * "+settlementItemVO.getMaterialNum()+" / (1+ "+settlementItemVO.getTaxAmount()+" * 0.01))";
67 }
68 this.setMaterialNum( JSUtils.executeExpression(materialNumExpression,"0.00"));
69 this.setTotalPrice( JSUtils.executeExpression(totalPriceExpression,"0.00"));
70 this.setTotalPriceTax( JSUtils.executeExpression(totalPriceTaxExpression,"0.00"));
71 }
72 }
45 } 73 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!