Skip to content

张雷 / skboot-zhongye

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

kangwei: 2、药剂到货统计查询功能不对，没有按时间查询出来，药剂名称、供货单位未显示，数量不准确，另外增加导出excel功能 

3、药剂入库审核中根据合同号搜索不出内容
1 个父辈 8cb3df17
内嵌 并排
正在显示 9 个修改的文件 包含 482 行增加 和 112 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpCommonController.java
...@@ -117,19 +117,18 @@ public class ErpCommonController { ...@@ -117,19 +117,18 @@ public class ErpCommonController {
117 sparepartTypeStr = String.join(",", sparepartTypeSet); 117 sparepartTypeStr = String.join(",", sparepartTypeSet);
118 } 118 }
119 materialSearchVO.setSparepartType(sparepartTypeStr) ; 119 materialSearchVO.setSparepartType(sparepartTypeStr) ;
120 }else{ 120 }
121 if(materialSearchVO.isMedicament()){ //查询药剂物料清单 121 if(materialSearchVO.getMedicament()){ //查询药剂物料清单
122 EquipmentSparepartType equipmentSparepartType = new EquipmentSparepartType(); 122 EquipmentSparepartType equipmentSparepartType = new EquipmentSparepartType();
123 equipmentSparepartType.setMedicament( materialSearchVO.isMedicament() ); 123 equipmentSparepartType.setMedicament( materialSearchVO.getMedicament() );
124 List<EquipmentSparepartType> sparepartTypeList = equipmentSparepartTypeService.querySparepartTypeList(equipmentSparepartType); 124 List<EquipmentSparepartType> sparepartTypeList = equipmentSparepartTypeService.querySparepartTypeList(equipmentSparepartType);
125 if(sparepartTypeList != null && !sparepartTypeList.isEmpty()){ 125 if(sparepartTypeList != null && !sparepartTypeList.isEmpty()){
126 for(EquipmentSparepartType sparepartType : sparepartTypeList){ 126 for(EquipmentSparepartType sparepartType : sparepartTypeList){
127 if(sparepartTypeStr.length() > 0 ) sparepartTypeStr+=","; 127 if(sparepartTypeStr.length() > 0 ) sparepartTypeStr+=",";
128 sparepartTypeStr += "'"+sparepartType.getId()+"'"; 128 sparepartTypeStr += "'"+sparepartType.getId()+"'";
129 }
130 } 129 }
131 materialSearchVO.setSparepartType(sparepartTypeStr) ;
132 } 130 }
131 materialSearchVO.setSparepartType(sparepartTypeStr) ;
133 } 132 }
134 IPage<PurchaseMaterialVO> pageList = purchaseMaterialService.queryPurchaseMaterialListByIn(page,materialSearchVO); 133 IPage<PurchaseMaterialVO> pageList = purchaseMaterialService.queryPurchaseMaterialListByIn(page,materialSearchVO);
135 result.setSuccess(true); 134 result.setSuccess(true);
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/MaterialINController.java
1 package com.skua.modules.erp.controller; 1 package com.skua.modules.erp.controller;
2 2
3 import java.util.ArrayList;
3 import java.util.Arrays; 4 import java.util.Arrays;
4 import java.util.List; 5 import java.util.List;
5 import java.util.Map; 6 import java.util.Map;
...@@ -31,7 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -31,7 +32,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
31 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 32 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
32 import com.skua.modules.erp.util.PdfUtil; 33 import com.skua.modules.erp.util.PdfUtil;
33 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO; 34 import com.skua.modules.erp.vo.ArrivalRecordExcelExportVO;
35 import com.skua.modules.erp.vo.MaterialINArrivalRecordVO;
34 import com.skua.modules.erp.vo.MaterialINVO; 36 import com.skua.modules.erp.vo.MaterialINVO;
37 import com.skua.modules.erp.vo.MaterialINXslVO;
35 import com.skua.modules.supplies.entity.EquipmentSparepartSupplies; 38 import com.skua.modules.supplies.entity.EquipmentSparepartSupplies;
36 import com.skua.modules.supplies.entity.EquipmentSparepartType; 39 import com.skua.modules.supplies.entity.EquipmentSparepartType;
37 import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesService; 40 import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesService;
...@@ -49,6 +52,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams; ...@@ -49,6 +52,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
49 import org.jeecgframework.poi.excel.entity.ImportParams; 52 import org.jeecgframework.poi.excel.entity.ImportParams;
50 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; 53 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
51 54
55 import org.springframework.beans.BeanUtils;
52 import org.springframework.beans.factory.annotation.Autowired; 56 import org.springframework.beans.factory.annotation.Autowired;
53 import org.springframework.beans.factory.annotation.Value; 57 import org.springframework.beans.factory.annotation.Value;
54 import org.springframework.web.bind.annotation.*; 58 import org.springframework.web.bind.annotation.*;
...@@ -148,24 +152,7 @@ public class MaterialINController { ...@@ -148,24 +152,7 @@ public class MaterialINController {
148 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>(); 152 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>();
149 QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap()); 153 QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
150 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize); 154 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize);
151 /*if(StringUtils.isNotBlank(materialIN.getDepartId())){ 155
152 queryWrapper.eq("depart_id",materialIN.getDepartId());
153 }
154 if(StringUtils.isNotBlank(materialIN.getAuditStatus())){
155 queryWrapper.eq("audit_status",materialIN.getAuditStatus());
156 }
157 *//*if(StringUtils.isNotBlank(materialIN.getConfirmStatus())){
158 queryWrapper.eq("confirm_status",materialIN.getConfirmStatus());
159 }*//*
160 if(StringUtils.isNotBlank(materialIN.getGoodCode())){
161 queryWrapper.like("good_code",materialIN.getGoodCode());
162 }
163 if(StringUtils.isNotBlank(materialIN.getStartTime())){
164 queryWrapper.ge("arrive_time",materialIN.getStartTime());
165 }
166 if(StringUtils.isNotBlank(materialIN.getEndTime())){
167 queryWrapper.le("arrive_time",materialIN.getEndTime());
168 }*/
169 //全部确认的数据 156 //全部确认的数据
170 queryWrapper.eq("confirm_status","9"); 157 queryWrapper.eq("confirm_status","9");
171 //检索采购合同 158 //检索采购合同
...@@ -173,14 +160,14 @@ public class MaterialINController { ...@@ -173,14 +160,14 @@ public class MaterialINController {
173 List<String> purchaseContractIdList = purchaseContractService.selectIdsByCode(req.getParameter("purchaseContractCode")); 160 List<String> purchaseContractIdList = purchaseContractService.selectIdsByCode(req.getParameter("purchaseContractCode"));
174 //purchaseContractIds 161 //purchaseContractIds
175 if(purchaseContractIdList != null && !purchaseContractIdList.isEmpty()){ 162 if(purchaseContractIdList != null && !purchaseContractIdList.isEmpty()){
176 queryWrapper.in("purchase_contract_id", JSUtils.quoteEach(purchaseContractIdList,",")); 163 queryWrapper.in("purchase_contract_id",purchaseContractIdList);// JSUtils.quoteEach(purchaseContractIdList,","));
177 } 164 }
178 } 165 }
179 //检索分销合同 166 //检索分销合同
180 if(StringUtils.isNotEmpty(req.getParameter("distributContractCode"))){ 167 if(StringUtils.isNotEmpty(req.getParameter("distributContractCode"))){
181 List<String> distributContractIdList = distributContractService.selectIdsByCode(req.getParameter("distributContractCode")); 168 List<String> distributContractIdList = distributContractService.selectIdsByCode(req.getParameter("distributContractCode"));
182 if(distributContractIdList != null && !distributContractIdList.isEmpty()){ 169 if(distributContractIdList != null && !distributContractIdList.isEmpty()){
183 queryWrapper.in("distribut_contract_id", JSUtils.quoteEach(distributContractIdList,",")); 170 queryWrapper.in("distribut_contract_id",distributContractIdList);// JSUtils.quoteEach(distributContractIdList,","));
184 } 171 }
185 } 172 }
186 // 需要添加条件判断 173 // 需要添加条件判断
...@@ -199,39 +186,20 @@ public class MaterialINController { ...@@ -199,39 +186,20 @@ public class MaterialINController {
199 @AutoLog(value = "erp--物料(药剂)入库--药剂到货日验收记录") 186 @AutoLog(value = "erp--物料(药剂)入库--药剂到货日验收记录")
200 @ApiOperation(value="erp--物料(药剂)入库-药剂到货日验收记录", notes="erp--物料(药剂)入库-药剂到货日验收记录") 187 @ApiOperation(value="erp--物料(药剂)入库-药剂到货日验收记录", notes="erp--物料(药剂)入库-药剂到货日验收记录")
201 @GetMapping(value = "/arrivalRecordList") 188 @GetMapping(value = "/arrivalRecordList")
202 public Result<List<MaterialIN>> arrivalRecordList(MaterialIN materialIN,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, 189 public Result<IPage<MaterialIN>> arrivalRecordList(MaterialIN materialIN,
203 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, 190 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
204 HttpServletRequest req) { 191 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
205 Result<List<MaterialIN>> result = new Result<List<MaterialIN>>(); 192 HttpServletRequest req) {
206 QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap()); 193 Result<IPage<MaterialIN>> result = new Result<IPage<MaterialIN>>();
207 /*if(StringUtils.isNotBlank(materialIN.getGoodCode())){ 194 QueryWrapper<MaterialIN> queryWrapper = QueryGenerator.initQueryWrapper(materialIN, req.getParameterMap());
208 queryWrapper.like("good_code",materialIN.getGoodCode()); 195 Page<MaterialIN> page = new Page<MaterialIN>(pageNo, pageSize);
209 } 196 queryWrapper.eq("audit_status","3");//审批通过
210 if(StringUtils.isNotBlank(materialIN.getStartTime())){ 197 queryWrapper.orderByDesc("arrive_time");
211 queryWrapper.ge("arrive_time",materialIN.getStartTime()); 198 IPage<MaterialIN> pageList = materialINService.page(page, queryWrapper);
212 } 199 result.setSuccess(true);
213 if(StringUtils.isNotBlank(materialIN.getEndTime())){ 200 result.setResult(pageList);
214 queryWrapper.le("arrive_time",materialIN.getEndTime()); 201 return result;
215 } 202 }
216 if(StringUtils.isNotBlank(materialIN.getDepartId())){
217 queryWrapper.eq("depart_id",materialIN.getDepartId());
218 }
219 if(StringUtils.isNotBlank(materialIN.getSupplierId())){
220 queryWrapper.eq("supplier_id",materialIN.getSupplierId());
221 }
222 if(StringUtils.isNotBlank(materialIN.getPurchaseContractId())){
223 queryWrapper.eq("purchase_contract_id",materialIN.getPurchaseContractId());
224 }*/
225 queryWrapper.eq("audit_status","3");
226 List<MaterialIN> pageList = materialINService.list( queryWrapper);
227
228
229 //List<ArrivalRecordExcelExportVO> pageList = materialINService.queryArrivalRecordByList(materialIN);
230
231 result.setSuccess(true);
232 result.setResult(pageList);
233 return result;
234 }
235 203
236 @AutoLog(value = "erp--物料(药剂)入库--获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索") 204 @AutoLog(value = "erp--物料(药剂)入库--获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索")
237 @ApiOperation(value="erp--物料(药剂)入库-获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索", notes="erp--物料(药剂)入库-获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索") 205 @ApiOperation(value="erp--物料(药剂)入库-获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索", notes="erp--物料(药剂)入库-获取入库审批列表：根据部门、采购合同、供应商、药剂分组搜索")
...@@ -403,17 +371,70 @@ public class MaterialINController { ...@@ -403,17 +371,70 @@ public class MaterialINController {
403 } catch (UnsupportedEncodingException e) { 371 } catch (UnsupportedEncodingException e) {
404 e.printStackTrace(); 372 e.printStackTrace();
405 } 373 }
406 374 if(queryWrapper == null ){
375 queryWrapper = new QueryWrapper();
376 }
377 //到货时间排序
378 queryWrapper.orderByDesc("arrive_time");
407 //Step.2 AutoPoi 导出Excel 379 //Step.2 AutoPoi 导出Excel
408 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); 380 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
409 List<MaterialIN> pageList = materialINService.list(queryWrapper); 381 List<MaterialIN> pageList = materialINService.list(queryWrapper);
410 //导出文件名称 382 //导出文件名称
411 mv.addObject(NormalExcelConstants.FILE_NAME, "药剂到货验收记录表"); 383 mv.addObject(NormalExcelConstants.FILE_NAME, "药剂到货验收记录表");
412 mv.addObject(NormalExcelConstants.CLASS, MaterialIN.class); 384 mv.addObject(NormalExcelConstants.CLASS, MaterialIN.class);
413 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("物料(药剂)入库单", "导出人:Jeecg", "导出信息")); 385 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("物料(药剂)入库单", "导出人:", "导出信息"));
414 mv.addObject(NormalExcelConstants.DATA_LIST, pageList); 386 mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
415 return mv; 387 return mv;
416 } 388 }
389 //导出到货记录
390 @RequestMapping(value = "/exportArrivalRecord")
391 public ModelAndView exportArrivalRecord(HttpServletRequest request, HttpServletResponse response) {
392 // Step.1 组装查询条件
393 QueryWrapper<MaterialIN> queryWrapper = null;
394 try {
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 //全部确认的数据
409 queryWrapper.eq("confirm_status","9");
410 queryWrapper.eq("audit_status","3");
411 queryWrapper.orderByDesc("arrive_time");
412
413 //Step.2 AutoPoi 导出Excel
414 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
415 List<MaterialIN> materialINList = materialINService.list(queryWrapper);
416
417 List<MaterialINArrivalRecordVO> dataList = new ArrayList<>();
418 MaterialINArrivalRecordVO arrivalRecordVO = null;
419
420 int index = 1;
421 if(materialINList != null && !materialINList.isEmpty()){
422 for(MaterialIN materialIN : materialINList){
423 arrivalRecordVO = new MaterialINArrivalRecordVO();
424 //BeanUtils.copyProperties(有值的对象, 要被赋值的对象);
425 BeanUtils.copyProperties(materialIN, arrivalRecordVO);
426 arrivalRecordVO.setIndex( index++);
427 dataList.add( arrivalRecordVO ) ;
428 }
429 }
430
431 //导出文件名称
432 mv.addObject(NormalExcelConstants.FILE_NAME, "药剂到货验收记录表");
433 mv.addObject(NormalExcelConstants.CLASS, MaterialINArrivalRecordVO.class);
434 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("物料(药剂)入库单", "导出人:", "导出信息"));
435 mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
436 return mv;
437 }
417 438
418 @AutoLog(value = "erp--药剂到货验收记录表") 439 @AutoLog(value = "erp--药剂到货验收记录表")
419 @ApiOperation(value="erp--药剂到货验收记录表", notes="erp--药剂到货验收记录表") 440 @ApiOperation(value="erp--药剂到货验收记录表", notes="erp--药剂到货验收记录表")
...@@ -470,8 +491,8 @@ public class MaterialINController { ...@@ -470,8 +491,8 @@ public class MaterialINController {
470 VelocityContext context = new VelocityContext(); 491 VelocityContext context = new VelocityContext();
471 492
472 //Step.3 准备模版表单参数 493 //Step.3 准备模版表单参数
473 context.put("startTime", materialIN.getStartTime());//开始时间 494 //context.put("startTime", materialIN.getStartTime());//开始时间
474 context.put("endTime", materialIN.getEndTime());//结束时间 495 // context.put("endTime", materialIN.getEndTime());//结束时间
475 context.put("supplierName", "");//供应商名称 496 context.put("supplierName", "");//供应商名称
476 if(StringUtils.isNotEmpty(materialIN.getSupplierId())){ 497 if(StringUtils.isNotEmpty(materialIN.getSupplierId())){
477 SupplierManage supplierManage = supplierManageService.getById(materialIN.getSupplierId()); 498 SupplierManage supplierManage = supplierManageService.getById(materialIN.getSupplierId());
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/MaterialIN.java
...@@ -7,12 +7,15 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -7,12 +7,15 @@ import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
8 import com.baomidou.mybatisplus.annotation.TableField; 8 import com.baomidou.mybatisplus.annotation.TableField;
9 import com.skua.core.aspect.annotation.Dict; 9 import com.skua.core.aspect.annotation.Dict;
10 import com.skua.tool.util.JSUtils;
11 import io.netty.util.internal.StringUtil;
10 import io.swagger.annotations.ApiModel; 12 import io.swagger.annotations.ApiModel;
11 import io.swagger.annotations.ApiModelProperty; 13 import io.swagger.annotations.ApiModelProperty;
12 import lombok.Data; 14 import lombok.Data;
13 import lombok.EqualsAndHashCode; 15 import lombok.EqualsAndHashCode;
14 import lombok.experimental.Accessors; 16 import lombok.experimental.Accessors;
15 import com.fasterxml.jackson.annotation.JsonFormat; 17 import com.fasterxml.jackson.annotation.JsonFormat;
18 import org.apache.commons.lang3.StringUtils;
16 import org.springframework.format.annotation.DateTimeFormat; 19 import org.springframework.format.annotation.DateTimeFormat;
17 import org.jeecgframework.poi.excel.annotation.Excel; 20 import org.jeecgframework.poi.excel.annotation.Excel;
18 21
...@@ -40,15 +43,14 @@ public class MaterialIN { ...@@ -40,15 +43,14 @@ public class MaterialIN {
40 @ApiModelProperty(value = "项目名称") 43 @ApiModelProperty(value = "项目名称")
41 private String projectName; 44 private String projectName;
42 /**入库单号*/ 45 /**入库单号*/
43 @Excel(name = "入库单号", width = 15)
44 @ApiModelProperty(value = "入库单号") 46 @ApiModelProperty(value = "入库单号")
45 private String inOrder; 47 private String inOrder;
46 /**采购合同*/ 48 /**采购合同*/
47 @Excel(name = "采购合同", width = 15) 49 @Excel(name = "采购合同", width = 15,dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code")
48 @Dict(dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code") 50 @Dict(dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code")
49 private String purchaseContractId; 51 private String purchaseContractId;
50 /**分销合同*/ 52 /**分销合同*/
51 @Excel(name = "分销合同", width = 15) 53 @Excel(name = "分销合同", width = 15,dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
52 @Dict(dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code") 54 @Dict(dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
53 private String distributContractId; 55 private String distributContractId;
54 /**到货时间*/ 56 /**到货时间*/
...@@ -56,17 +58,17 @@ public class MaterialIN { ...@@ -56,17 +58,17 @@ public class MaterialIN {
56 @ApiModelProperty(value = "到货时间") 58 @ApiModelProperty(value = "到货时间")
57 private String arriveTime; 59 private String arriveTime;
58 /**收货人*/ 60 /**收货人*/
59 @Excel(name = "收货人", width = 15) 61 @Excel(name = "收货人", width = 15,dictTable = "sys_user", dicCode="id", dicText = "realname")
60 @ApiModelProperty(value = "收货人") 62 @ApiModelProperty(value = "收货人")
61 @Dict(dictTable = "sys_user", dicCode="id", dicText = "realname") 63 @Dict(dictTable = "sys_user", dicCode="id", dicText = "realname")
62 private String receiver; 64 private String receiver;
63 65
64 @Excel(name = "物料类别", width = 15) 66 @Excel(name = "物料类别", width = 15,dictTable = "equipment_sparepart_type", dicCode="id", dicText = "item_text")
65 @ApiModelProperty(value = "物料类别") 67 @ApiModelProperty(value = "物料类别")
66 @Dict(dictTable = "equipment_sparepart_type", dicCode="id", dicText = "item_text") 68 @Dict(dictTable = "equipment_sparepart_type", dicCode="id", dicText = "item_text")
67 private String sparepartType; 69 private String sparepartType;
68 /**物料编号*/ 70 /**物料编号*/
69 @Excel(name = "物料编号", width = 15) 71 @Excel(name = "物料编号", width = 15,dictTable = "equipment_sparepart_supplies", dicCode="id", dicText = "sparepart_name")
70 @ApiModelProperty(value = "物料编号") 72 @ApiModelProperty(value = "物料编号")
71 @Dict(dictTable = "equipment_sparepart_supplies", dicCode="id", dicText = "sparepart_name") 73 @Dict(dictTable = "equipment_sparepart_supplies", dicCode="id", dicText = "sparepart_name")
72 private String sparepartId; 74 private String sparepartId;
...@@ -85,18 +87,14 @@ public class MaterialIN { ...@@ -85,18 +87,14 @@ public class MaterialIN {
85 @Excel(name = "计量单位", width = 15) 87 @Excel(name = "计量单位", width = 15)
86 @ApiModelProperty(value = "计量单位") 88 @ApiModelProperty(value = "计量单位")
87 private String measuringUnit; 89 private String measuringUnit;
88 /**数量*/
89 @ApiModelProperty(value = "数量")
90 private String purchaseNum;
91 90
92 @Excel(name = "入库仓库", width = 15) 91 @Excel(name = "入库仓库", width = 15,dictTable = "supplies_warehouse", dicCode="id", dicText = "warehouse_name")
93 @ApiModelProperty(value = "入库仓库") 92 @ApiModelProperty(value = "入库仓库")
94 @Dict(dictTable = "supplies_warehouse", dicCode="id", dicText = "warehouse_name") 93 @Dict(dictTable = "supplies_warehouse", dicCode="id", dicText = "warehouse_name")
95 private String inWarehouseId; 94 private String inWarehouseId;
96 95
97
98 /**供应商编号*/ 96 /**供应商编号*/
99 @Excel(name = "供应商编号", width = 15) 97 @Excel(name = "供应商", width = 15,dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
100 @ApiModelProperty(value = "供应商编号") 98 @ApiModelProperty(value = "供应商编号")
101 @Dict(dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name") 99 @Dict(dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
102 private String supplierId; 100 private String supplierId;
...@@ -110,33 +108,25 @@ public class MaterialIN { ...@@ -110,33 +108,25 @@ public class MaterialIN {
110 /**分销单价*/ 108 /**分销单价*/
111 @ApiModelProperty(value = "分销单价") 109 @ApiModelProperty(value = "分销单价")
112 private String distributPrice; 110 private String distributPrice;
113 /**采购总价*/
114 @ApiModelProperty(value = "采购总价")
115 private String purchaseTotalPrice;
116 111
117 @Excel(name = "物料数量", width = 15) 112 @Excel(name = "物料数量", width = 15)
118 @ApiModelProperty(value = "物料数量") 113 @ApiModelProperty(value = "物料数量")
119 private String materialNum; 114 private String materialNum;
120 /**分销总价*/ 115
121 @ApiModelProperty(value = "分销总价")
122 private String distributTotalPrice;
123 /**税额*/ 116 /**税额*/
124 @Excel(name = "税额", width = 15)
125 @ApiModelProperty(value = "税额") 117 @ApiModelProperty(value = "税额")
126 private String taxAmount; 118 private String taxAmount;
127 /**价税合计*/ 119
128 @ApiModelProperty(value = "价税合计")
129 private String totalPriceTax;
130 /**分享地址*/ 120 /**分享地址*/
131 @ApiModelProperty(value = "分享地址") 121 @ApiModelProperty(value = "分享地址")
132 private String shareUrl; 122 private String shareUrl;
133 /**确认状态：0 未确认 1 部分确认 2 全部确认*/ 123 /**确认状态：0 未确认 1 部分确认 2 全部确认*/
134 @Excel(name = "确认状态：0 未确认 1 部分确认 2 全部确认", width = 15) 124 @Excel(name = "确认状态", width = 15,dicCode="purchase_confirm_status")
135 @ApiModelProperty(value = "确认状态：0 未确认 1 部分确认 2 全部确认") 125 @ApiModelProperty(value = "确认状态：0 未确认 1 部分确认 2 全部确认")
136 @Dict( dicCode="purchase_confirm_status") 126 @Dict( dicCode="purchase_confirm_status")
137 private String confirmStatus; 127 private String confirmStatus;
138 /**审批状态：0 未发布 1 已发布（待审核）2 审核驳回 3 审核通过*/ 128 /**审批状态：0 未发布 1 已发布（待审核）2 审核驳回 3 审核通过*/
139 @Excel(name = "审批状态：0 未发布 1 已发布（待审核）2 审核驳回 3 审核通过", width = 15) 129 @Excel(name = "审批状态", width = 15,dicCode="audit_status")
140 @ApiModelProperty(value = "审批状态：0 未发布 1 已发布（待审核）2 审核驳回 3 审核通过") 130 @ApiModelProperty(value = "审批状态：0 未发布 1 已发布（待审核）2 审核驳回 3 审核通过")
141 @Dict( dicCode="audit_status") 131 @Dict( dicCode="audit_status")
142 private String auditStatus; 132 private String auditStatus;
...@@ -148,7 +138,6 @@ public class MaterialIN { ...@@ -148,7 +138,6 @@ public class MaterialIN {
148 private String applyUser; 138 private String applyUser;
149 139
150 /**入库类型*/ 140 /**入库类型*/
151 @Excel(name = "入库类型", width = 15)
152 @ApiModelProperty(value = "入库类型") 141 @ApiModelProperty(value = "入库类型")
153 private String inType; 142 private String inType;
154 /**备注*/ 143 /**备注*/
...@@ -156,7 +145,7 @@ public class MaterialIN { ...@@ -156,7 +145,7 @@ public class MaterialIN {
156 @ApiModelProperty(value = "备注") 145 @ApiModelProperty(value = "备注")
157 private String remark; 146 private String remark;
158 /**创建人id*/ 147 /**创建人id*/
159 @Excel(name = "创建人id", width = 15) 148 @Excel(name = "创建人", width = 15)
160 @ApiModelProperty(value = "创建人id") 149 @ApiModelProperty(value = "创建人id")
161 private String createBy; 150 private String createBy;
162 /**创建时间*/ 151 /**创建时间*/
...@@ -176,15 +165,12 @@ public class MaterialIN { ...@@ -176,15 +165,12 @@ public class MaterialIN {
176 @ApiModelProperty(value = "修改时间") 165 @ApiModelProperty(value = "修改时间")
177 private Date updateTime; 166 private Date updateTime;
178 /**所属部门*/ 167 /**所属部门*/
179 @Excel(name = "所属部门", width = 15)
180 @ApiModelProperty(value = "所属部门") 168 @ApiModelProperty(value = "所属部门")
181 private String createDept; 169 private String createDept;
182 /**所属公司*/ 170 /**所属公司*/
183 @Excel(name = "所属公司", width = 15)
184 @ApiModelProperty(value = "所属公司") 171 @ApiModelProperty(value = "所属公司")
185 private String createCmpy; 172 private String createCmpy;
186 /**删除标识，0:正常,1:删除*/ 173 /**删除标识，0:正常,1:删除*/
187 @Excel(name = "删除标识，0:正常,1:删除", width = 15)
188 @ApiModelProperty(value = "删除标识，0:正常,1:删除") 174 @ApiModelProperty(value = "删除标识，0:正常,1:删除")
189 private Integer delFlag; 175 private Integer delFlag;
190 176
...@@ -194,20 +180,25 @@ public class MaterialIN { ...@@ -194,20 +180,25 @@ public class MaterialIN {
194 @ApiModelProperty(value = "出库编号") 180 @ApiModelProperty(value = "出库编号")
195 private String equipmentOutId; 181 private String equipmentOutId;
196 182
197 @ApiModelProperty(value = "供应商结算，0:未结算,1::已申请，2：已结算") 183 @Excel(name = "供应商结算", width = 15)
184 @ApiModelProperty(value = "供应商结算，0:申请,1::已申请，2：已结算")
185 @Dict( dicCode="settlement_status")
198 private Integer supplierSettlementFlag; 186 private Integer supplierSettlementFlag;
199 187
200 @ApiModelProperty(value = "水厂结算，0:未结算,1:已申请，2：已结算") 188 @Excel(name = "水厂结算", width = 15)
189 @ApiModelProperty(value = "水厂结算，0:未申请,1:已申请，2：已结算")
190 @Dict( dicCode="settlement_status")
201 private Integer waterDepartSettlementFlag; 191 private Integer waterDepartSettlementFlag;
202 192
203 @TableField(exist = false) 193 @TableField(exist = false)
204 @ApiModelProperty(value = "结束时间")
205 private String endTime;
206 @TableField(exist = false)
207 @ApiModelProperty(value = "开始时间") 194 @ApiModelProperty(value = "开始时间")
208 private String startTime; 195 private String startTime;
209 196
210 @TableField(exist = false) 197 @TableField(exist = false)
198 @ApiModelProperty(value = "结束时间")
199 private String endTime;
200
201 @TableField(exist = false)
211 @ApiModelProperty(value = "物料类别") 202 @ApiModelProperty(value = "物料类别")
212 private String sparepartTypeName; 203 private String sparepartTypeName;
213 204
...@@ -216,7 +207,41 @@ public class MaterialIN { ...@@ -216,7 +207,41 @@ public class MaterialIN {
216 private String supplierName; 207 private String supplierName;
217 208
218 @TableField(exist = false) 209 @TableField(exist = false)
219 @Excel(name="机构/部门名称",width=15)
220 private String departName; 210 private String departName;
221 211
212
213 /**采购总价*/
214 @TableField(exist = false)
215 @ApiModelProperty(value = "采购总价")
216 private String purchaseTotalPrice;
217 /**价税合计*/
218 @TableField(exist = false)
219 @ApiModelProperty(value = "总价（不含税)")
220 private String totalPriceTax;
221 /**分销总价*/
222 @TableField(exist = false)
223 @ApiModelProperty(value = "分销总价")
224 private String distributTotalPrice;
225 public String getPurchaseTotalPrice() {
226 if(StringUtils.isNotEmpty(this.getPurchasePrice()) && StringUtils.isNotEmpty(this.getMaterialNum())){
227 purchaseTotalPrice = JSUtils.multiply(purchasePrice ,materialNum ) ;
228 }
229 return purchaseTotalPrice;
230 }
231
232 public String getDistributTotalPrice() {
233 if( StringUtils.isNotEmpty(this.getDistributPrice()) && StringUtils.isNotEmpty(this.getMaterialNum())){
234 distributTotalPrice = JSUtils.multiply(distributPrice ,materialNum ) ;
235 }
236 return distributTotalPrice;
237 }
238
239 public String getTotalPriceTax() {
240 //不含税总价 = 含税总价 / (1 + 税率)
241 if(StringUtils.isNotEmpty(this.getTaxAmount()) && StringUtils.isNotEmpty(this.getDistributPrice()) && StringUtils.isNotEmpty(this.getMaterialNum())){
242 String expression = distributPrice +" * " +materialNum +"/( 1 +"+taxAmount+"* 0.01)";
243 totalPriceTax = JSUtils.executeExpression(expression ,"0.00" ) ;
244 }
245 return totalPriceTax;
246 }
222 } 247 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINArrivalRecordVO.java 0 → 100644
1 package com.skua.modules.erp.vo;
2
3 import com.baomidou.mybatisplus.annotation.TableName;
4 import com.skua.core.aspect.annotation.Dict;
5 import com.skua.tool.util.JSUtils;
6 import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data;
9 import lombok.EqualsAndHashCode;
10 import lombok.experimental.Accessors;
11 import org.jeecgframework.poi.excel.annotation.Excel;
12
13 /**
14 * @auther kangwei
15 * @create 2025-02-08-10:02
16 */
17 @Data
18 @TableName("erp_material_in")
19 @EqualsAndHashCode(callSuper = false)
20 @Accessors(chain = true)
21 @ApiModel(value="药剂到货记录", description="药剂到货记录")
22 public class MaterialINArrivalRecordVO {
23 /**项目名称*/
24 @Excel(name = "序号", width = 15 ,orderNum = "2")
25 @ApiModelProperty(value = "序号")
26 private Integer index;
27
28 @Excel(name = "到货时间", width = 15,orderNum = "2")
29 @ApiModelProperty(value = "到货时间")
30 private String arriveTime;
31
32 @Excel(name = "使用单位", width = 15,orderNum = "3",dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
33 @ApiModelProperty(value = "所属机构")
34 @Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
35 private String departId;
36
37 @Excel(name = "药剂名称", width = 15,orderNum = "4")
38 @ApiModelProperty(value = "药剂(物料)名称")
39 private String sparepartName;
40
41 @Excel(name = "单位", width = 15,orderNum = "5")
42 @ApiModelProperty(value = "单位")
43 private String measuringUnit;
44
45 @Excel(name = "数量", width = 15,orderNum = "6")
46 @ApiModelProperty(value = "数量")
47 private String materialNum;
48
49 @Excel(name = "供货单位", width = 15,orderNum = "7",dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
50 @ApiModelProperty(value = "供应商编号")
51 @Dict(dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
52 private String supplierId;
53 /**货号*/
54 @Excel(name = "货号", width = 15,orderNum = "7")
55 @ApiModelProperty(value = "货号")
56 private String goodCode;
57
58 @Excel(name = "采购合同", width = 15,orderNum = "8",dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code")
59 @Dict(dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code")
60 private String purchaseContractId;
61 /**分销合同*/
62 @Excel(name = "分销合同", width = 15,orderNum = "9",dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
63 @Dict(dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
64 private String distributContractId;
65 /**采购单价*/
66 @ApiModelProperty(value = "采购单价")
67 private String purchasePrice;
68 /**分销单价*/
69 @ApiModelProperty(value = "分销单价")
70 private String distributPrice;
71 /**采购总价*/
72 @Excel(name = "采购总价", width = 15,orderNum = "10")
73 @ApiModelProperty(value = "采购总价")
74 private String purchaseTotalPrice;
75
76 /**分销总价*/
77 @Excel(name = "分销总价", width = 15,orderNum = "11")
78 @ApiModelProperty(value = "分销总价")
79 private String distributTotalPrice;
80
81 public String getPurchaseTotalPrice() {
82 purchaseTotalPrice = JSUtils.multiply(purchasePrice ,materialNum ) ;
83 return purchaseTotalPrice;
84 }
85
86 public String getDistributTotalPrice() {
87 distributTotalPrice = JSUtils.multiply(distributPrice ,materialNum ) ;
88 return distributTotalPrice;
89 }
90 }
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialINXslVO.java 0 → 100644
1 package com.skua.modules.erp.vo;
2
3 /**
4 * @auther kangwei
5 * @create 2025-02-08-9:18
6 */
7
8 import com.baomidou.mybatisplus.annotation.IdType;
9 import com.baomidou.mybatisplus.annotation.TableField;
10 import com.baomidou.mybatisplus.annotation.TableId;
11 import com.baomidou.mybatisplus.annotation.TableName;
12 import com.fasterxml.jackson.annotation.JsonFormat;
13 import com.skua.core.aspect.annotation.Dict;
14 import com.skua.tool.util.JSUtils;
15 import io.swagger.annotations.ApiModel;
16 import io.swagger.annotations.ApiModelProperty;
17 import lombok.Data;
18 import lombok.EqualsAndHashCode;
19 import lombok.experimental.Accessors;
20 import org.jeecgframework.poi.excel.annotation.Excel;
21 import org.springframework.format.annotation.DateTimeFormat;
22
23 import java.util.Date;
24
25 /**
26 * 物料(药剂)入库
27 */
28 @Data
29 @TableName("erp_material_in")
30 @EqualsAndHashCode(callSuper = false)
31 @Accessors(chain = true)
32 @ApiModel(value="erp_material_in对象", description="物料(药剂)入库")
33 public class MaterialINXslVO {
34 /**id*/
35 @TableId(type = IdType.ID_WORKER_STR)
36 @ApiModelProperty(value = "id")
37 private String id;
38 /**所属机构*/
39 @Excel(name = "所属机构", width = 15)
40 @ApiModelProperty(value = "所属机构")
41 @Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
42 private String departId;
43 /**项目名称*/
44 @Excel(name = "项目名称", width = 15)
45 @ApiModelProperty(value = "项目名称")
46 private String projectName;
47 /**入库单号*/
48 @Excel(name = "入库单号", width = 15)
49 @ApiModelProperty(value = "入库单号")
50 private String inOrder;
51 /**采购合同*/
52 @Excel(name = "采购合同", width = 15)
53 @Dict(dictTable = "erp_purchase_contract", dicCode="id", dicText = "contract_code")
54 private String purchaseContractId;
55 /**分销合同*/
56 @Excel(name = "分销合同", width = 15)
57 @Dict(dictTable = "erp_distribut_contract", dicCode="id", dicText = "contract_code")
58 private String distributContractId;
59 /**到货时间*/
60 @Excel(name = "到货时间", width = 15)
61 @ApiModelProperty(value = "到货时间")
62 private String arriveTime;
63 /**收货人*/
64 @Excel(name = "收货人", width = 15)
65 @ApiModelProperty(value = "收货人")
66 @Dict(dictTable = "sys_user", dicCode="id", dicText = "realname")
67 private String receiver;
68
69 @Excel(name = "物料类别", width = 15)
70 @ApiModelProperty(value = "物料类别")
71 @Dict(dictTable = "equipment_sparepart_type", dicCode="id", dicText = "item_text")
72 private String sparepartType;
73 /**物料编号*/
74 @Excel(name = "物料编号", width = 15)
75 @ApiModelProperty(value = "物料编号")
76 @Dict(dictTable = "equipment_sparepart_supplies", dicCode="id", dicText = "sparepart_name")
77 private String sparepartId;
78 /**药剂(物料)名称*/
79 @Excel(name = "药剂(物料)名称", width = 15)
80 @ApiModelProperty(value = "药剂(物料)名称")
81 private String sparepartName;
82
83 @ApiModelProperty(value = "物料编码")
84 private String sparepartCode;
85 /**规格型号*/
86 @Excel(name = "规格型号", width = 15)
87 @ApiModelProperty(value = "规格型号")
88 private String specification;
89 /**计量单位*/
90 @Excel(name = "计量单位", width = 15)
91 @ApiModelProperty(value = "计量单位")
92 private String measuringUnit;
93 /**数量*/
94 private String purchaseNum;
95
96 @Excel(name = "入库仓库", width = 15)
97 @ApiModelProperty(value = "入库仓库")
98 @Dict(dictTable = "supplies_warehouse", dicCode="id", dicText = "warehouse_name")
99 private String inWarehouseId;
100
101 /**供应商编号*/
102 @Excel(name = "供应商", width = 15)
103 @ApiModelProperty(value = "供应商编号")
104 @Dict(dictTable = "ajh_supplier_manage", dicCode="id", dicText = "supp_name")
105 private String supplierId;
106 /**货号*/
107 @Excel(name = "货号", width = 15)
108 @ApiModelProperty(value = "货号")
109 private String goodCode;
110 /**采购单价*/
111 @Excel(name = "采购单价", width = 15)
112 @ApiModelProperty(value = "采购单价")
113 private String purchasePrice;
114 /**分销单价*/
115 @Excel(name = "分销单价", width = 15)
116 @ApiModelProperty(value = "分销单价")
117 private String distributPrice;
118 /**采购总价*/
119 @Excel(name = "采购总价", width = 15)
120 @ApiModelProperty(value = "采购总价")
121 private String purchaseTotalPrice;
122
123 @Excel(name = "物料数量", width = 15)
124 @ApiModelProperty(value = "物料数量")
125 private String materialNum;
126 /**分销总价*/
127 @Excel(name = "分销总价", width = 15)
128 @ApiModelProperty(value = "分销总价")
129 private String distributTotalPrice;
130
131 public String getPurchaseTotalPrice() {
132 purchaseTotalPrice = JSUtils.multiply(purchasePrice ,materialNum ) ;
133 return purchaseTotalPrice;
134 }
135
136 public String getDistributTotalPrice() {
137 distributTotalPrice = JSUtils.multiply(distributPrice ,materialNum ) ;
138 return distributTotalPrice;
139 }
140
141 /**税额*/
142 @ApiModelProperty(value = "税额")
143 private String taxAmount;
144 /**价税合计*/
145 @ApiModelProperty(value = "价税合计")
146 private String totalPriceTax;
147 /**分享地址*/
148 @ApiModelProperty(value = "分享地址")
149 private String shareUrl;
150 /**确认状态：0 未确认 1 部分确认 2 全部确认*/
151 @Excel(name = "确认状态", width = 15)
152 @ApiModelProperty(value = "确认状态：0 未确认 1 部分确认 2 全部确认")
153 @Dict( dicCode="purchase_confirm_status")
154 private String confirmStatus;
155 /**审批状态：0 未发布 1 已发布（待审核）2 审核驳回 3 审核通过*/
156 @Excel(name = "审批状态", width = 15)
157 @ApiModelProperty(value = "审批状态：0 未发布 1 已发布（待审核）2 审核驳回 3 审核通过")
158 @Dict( dicCode="audit_status")
159 private String auditStatus;
160
161 /**审批意见*/
162 @ApiModelProperty(value = "审批意见")
163 private String approveMessage;
164 @ApiModelProperty(value = "申请人")
165 private String applyUser;
166
167 /**入库类型*/
168 @ApiModelProperty(value = "入库类型")
169 private String inType;
170 /**备注*/
171 @Excel(name = "备注", width = 15)
172 @ApiModelProperty(value = "备注")
173 private String remark;
174 /**创建人id*/
175 @Excel(name = "创建人", width = 15)
176 @ApiModelProperty(value = "创建人id")
177 private String createBy;
178 /**创建时间*/
179 @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
180 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
181 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
182 @ApiModelProperty(value = "创建时间")
183 private Date createTime;
184 /**修改人id*/
185 @Excel(name = "修改人id", width = 15)
186 @ApiModelProperty(value = "修改人id")
187 private String updateBy;
188 /**修改时间*/
189 @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
190 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
191 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
192 @ApiModelProperty(value = "修改时间")
193 private Date updateTime;
194 /**所属部门*/
195 @ApiModelProperty(value = "所属部门")
196 private String createDept;
197 /**所属公司*/
198 @ApiModelProperty(value = "所属公司")
199 private String createCmpy;
200 /**删除标识，0:正常,1:删除*/
201 @ApiModelProperty(value = "删除标识，0:正常,1:删除")
202 private Integer delFlag;
203
204 @ApiModelProperty(value = "入库编号")
205 private String equipmentInId;
206
207 @ApiModelProperty(value = "出库编号")
208 private String equipmentOutId;
209
210 @Excel(name = "供应商结算", width = 15)
211 @ApiModelProperty(value = "供应商结算，0:申请,1::已申请，2：已结算")
212 @Dict( dicCode="settlement_status")
213 private Integer supplierSettlementFlag;
214
215 @Excel(name = "水厂结算", width = 15)
216 @ApiModelProperty(value = "水厂结算，0:未申请,1:已申请，2：已结算")
217 @Dict( dicCode="settlement_status")
218 private Integer waterDepartSettlementFlag;
219
220 @TableField(exist = false)
221 @ApiModelProperty(value = "开始时间")
222 private String startTime;
223
224 @TableField(exist = false)
225 @ApiModelProperty(value = "结束时间")
226 private String endTime;
227
228 @TableField(exist = false)
229 @ApiModelProperty(value = "物料类别")
230 private String sparepartTypeName;
231
232 @TableField(exist = false)
233 @ApiModelProperty(value = "供应商名称")
234 private String supplierName;
235
236 @TableField(exist = false)
237 @Excel(name="机构/部门名称",width=15)
238 private String departName;
239 }
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialSearchVO.java
...@@ -34,7 +34,6 @@ public class MaterialSearchVO { ...@@ -34,7 +34,6 @@ public class MaterialSearchVO {
34 @ApiModelProperty(value = "物料类型") 34 @ApiModelProperty(value = "物料类型")
35 private String sparepartType; 35 private String sparepartType;
36 36
37
38 @ApiModelProperty(value = "是否药剂") 37 @ApiModelProperty(value = "是否药剂")
39 private boolean medicament = false; 38 private Boolean medicament = false;
40 } 39 }
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/PurchaseMaterialVO.java
...@@ -74,6 +74,8 @@ public class PurchaseMaterialVO { ...@@ -74,6 +74,8 @@ public class PurchaseMaterialVO {
74 @ApiModelProperty(value = "备注") 74 @ApiModelProperty(value = "备注")
75 private java.lang.String remark; 75 private java.lang.String remark;
76 76
77 @ApiModelProperty(value = "税额")
78 private String taxAmount;
77 79
78 @TableField(exist=false) 80 @TableField(exist=false)
79 @ApiModelProperty(value = "物料类别名称") 81 @ApiModelProperty(value = "物料类别名称")
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentOutExcel.java
...@@ -3,18 +3,13 @@ package com.skua.modules.equipment.vo; ...@@ -3,18 +3,13 @@ package com.skua.modules.equipment.vo;
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableId; 4 import com.baomidou.mybatisplus.annotation.TableId;
5 import com.baomidou.mybatisplus.annotation.TableName; 5 import com.baomidou.mybatisplus.annotation.TableName;
6 import com.fasterxml.jackson.annotation.JsonFormat;
7 import com.skua.core.aspect.annotation.Dict; 6 import com.skua.core.aspect.annotation.Dict;
8 import com.skua.tool.annotation.BeanAnno;
9 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
10 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
11 import lombok.Data; 9 import lombok.Data;
12 import lombok.EqualsAndHashCode; 10 import lombok.EqualsAndHashCode;
13 import lombok.experimental.Accessors; 11 import lombok.experimental.Accessors;
14 import org.jeecgframework.poi.excel.annotation.Excel; 12 import org.jeecgframework.poi.excel.annotation.Excel;
15 import org.springframework.format.annotation.DateTimeFormat;
16
17 import java.util.Date;
18 13
19 /** 14 /**
20 * 入库 15 * 入库
......
sk-module-system/src/main/java/com/skua/config/mybatis/MybatisInterceptor.java
...@@ -100,7 +100,7 @@ public class MybatisInterceptor implements Interceptor { ...@@ -100,7 +100,7 @@ public class MybatisInterceptor implements Interceptor {
100 add("equipment_sparepart"); 100 add("equipment_sparepart");
101 101
102 //material_info 102 //material_info
103 add("material_info"); 103 //add("material_info");
104 //三废 104 //三废
105 //add("ajh_waste_gas"); 105 //add("ajh_waste_gas");
106 //噪音 106 //噪音
...@@ -145,7 +145,7 @@ public class MybatisInterceptor implements Interceptor { ...@@ -145,7 +145,7 @@ public class MybatisInterceptor implements Interceptor {
145 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMapper.countByDate".equalsIgnoreCase(sqlId) 145 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMapper.countByDate".equalsIgnoreCase(sqlId)
146 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMapper.levelHistogramList".equalsIgnoreCase(sqlId) 146 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMapper.levelHistogramList".equalsIgnoreCase(sqlId)
147 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMapper.dutyHistogramList".equalsIgnoreCase(sqlId) 147 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMapper.dutyHistogramList".equalsIgnoreCase(sqlId)
148 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMapper.classifyList".equalsIgnoreCase(sqlId) 148 || "com.skua.modules.ajh.mapper.AjhRectificationInfoMaMaterialINpper.classifyList".equalsIgnoreCase(sqlId)
149 || "com.skua.modules.ajh.mapper.AjhMeetingMinutesMapper.getDataById".equalsIgnoreCase(sqlId) 149 || "com.skua.modules.ajh.mapper.AjhMeetingMinutesMapper.getDataById".equalsIgnoreCase(sqlId)
150 || "com.skua.modules.system.mapper.SysDepartMapper.queryUserDeparts".equalsIgnoreCase(sqlId) 150 || "com.skua.modules.system.mapper.SysDepartMapper.queryUserDeparts".equalsIgnoreCase(sqlId)
151 || "com.skua.modules.system.mapper.SysAnnouncementMapper.querySysCementListByUserId".equals(sqlId) 151 || "com.skua.modules.system.mapper.SysAnnouncementMapper.querySysCementListByUserId".equals(sqlId)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!