|
|
@@ -10,61 +10,116 @@ import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
-import org.jeecg.modules.wzOutboundOrder.convert.WzOutboundOrderBConvert;
|
|
|
+import org.jeecg.modules.wzOutboundOrder.entity.CLfCompareDO;
|
|
|
import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
|
|
|
import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderBService;
|
|
|
import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderHService;
|
|
|
-import org.jeecg.modules.wzOutboundOrder.vo.CLFCompareListVO;
|
|
|
+import org.jeecg.modules.wzOutboundOrder.vo.CLFCompareResultVO;
|
|
|
+import org.jeecg.modules.wzOutboundOrder.vo.CLFCompareTaskResultVo;
|
|
|
+import org.jeecg.modules.wzOutboundOrder.vo.CLfCompareResultListVo;
|
|
|
import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
|
|
|
-import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBWLBMListVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.math.BigDecimal;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @Description: 物资出库单
|
|
|
* @Author: jeecg-boot
|
|
|
- * @Date: 2023-08-17
|
|
|
+ * @Date: 2023-08-17
|
|
|
* @Version: V1.0
|
|
|
*/
|
|
|
-@Api(tags="物资出库单")
|
|
|
+@Api(tags = "物资出库单")
|
|
|
@RestController
|
|
|
@RequestMapping("/wzOutboundOrder/wzOutboundOrderH")
|
|
|
@Slf4j
|
|
|
public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH, IWzOutboundOrderHService> {
|
|
|
- @Autowired
|
|
|
- @SuppressWarnings("all")
|
|
|
- private IWzOutboundOrderHService wzOutboundOrderHService;
|
|
|
- @Autowired
|
|
|
- @SuppressWarnings("all")
|
|
|
- private IWzOutboundOrderBService bService;
|
|
|
-
|
|
|
-
|
|
|
- /**
|
|
|
- * 导出材料费详情excel
|
|
|
- *
|
|
|
- */
|
|
|
- @ApiOperation(value="项目成本——导出材料费详情excel")
|
|
|
- @RequestMapping(value = "/exportCLFDetail")
|
|
|
- public ModelAndView exportCLFDetail(String taskno) {
|
|
|
- List<WzOutboundOrderBDetailListVO> list = getCLFList(taskno);
|
|
|
- return wzOutboundOrderHService.exportHteDetail(list,WzOutboundOrderBDetailListVO.class, "材料费详情");
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- /**
|
|
|
- * 项目成本——材料费详情对比
|
|
|
- */
|
|
|
- @ApiOperation(value="项目成本——材料费详情对比", notes="项目成本——材料费详情对比")
|
|
|
+ @Autowired
|
|
|
+ @SuppressWarnings("all")
|
|
|
+ private IWzOutboundOrderHService wzOutboundOrderHService;
|
|
|
+ @Autowired
|
|
|
+ @SuppressWarnings("all")
|
|
|
+ private IWzOutboundOrderBService bService;
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 导出材料费详情excel
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "项目成本——导出材料费详情excel")
|
|
|
+ @RequestMapping(value = "/exportCLFDetail")
|
|
|
+ public ModelAndView exportCLFDetail(String taskno) {
|
|
|
+ List<WzOutboundOrderBDetailListVO> list = getCLFList(taskno);
|
|
|
+ return wzOutboundOrderHService.exportHteDetail(list, WzOutboundOrderBDetailListVO.class, "材料费详情");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 项目成本——材料费详情对比
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "项目成本——材料费详情对比", notes = "项目成本——材料费详情对比")
|
|
|
+ @GetMapping(value = "/compareCLFDetailList")
|
|
|
+ public Result<CLfCompareResultListVo> compareCLFDetailList(String tasknos) {
|
|
|
+ CLfCompareResultListVo result = new CLfCompareResultListVo();
|
|
|
+ ArrayList<CLFCompareResultVO> clfCompareResultVOS = new ArrayList<>();
|
|
|
+ String[] tasknoList = tasknos.split(",");
|
|
|
+ HashMap<String, List<CLfCompareDO>> compareMap = new HashMap<>();
|
|
|
+ for (String taskno : tasknoList) {
|
|
|
+ List<CLfCompareDO> Dos = wzOutboundOrderHService.getCLFCompareDoListByTaskNoList(taskno);
|
|
|
+ if (!Dos.isEmpty()) {
|
|
|
+ Dos.forEach(dos-> {
|
|
|
+ String hashKey = dos.getWlbm() + dos.getWlmc() + dos.getGgxh();
|
|
|
+ List<CLfCompareDO> cLfCompareDOS = compareMap.get(hashKey);
|
|
|
+ if (cLfCompareDOS == null) cLfCompareDOS = new ArrayList<>();
|
|
|
+ cLfCompareDOS.add(dos);
|
|
|
+ compareMap.put(hashKey,cLfCompareDOS);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (compareMap.isEmpty()) return Result.ok("没有找到结果");
|
|
|
+
|
|
|
+ for (String s : compareMap.keySet()) {
|
|
|
+ List<CLfCompareDO> cLfCompareDOS = compareMap.get(s);
|
|
|
+ CLFCompareResultVO clfCompareResultVO = new CLFCompareResultVO();
|
|
|
+ CLfCompareDO cLfCompareDO = cLfCompareDOS.get(0);
|
|
|
+ clfCompareResultVO.setWlbm(cLfCompareDO.getWlbm());
|
|
|
+ clfCompareResultVO.setWlmc(cLfCompareDO.getWlmc());
|
|
|
+ clfCompareResultVO.setGgxh(cLfCompareDO.getGgxh());
|
|
|
+ ArrayList<CLFCompareTaskResultVo> taskVoList = new ArrayList<>();
|
|
|
+ for (CLfCompareDO CDo : cLfCompareDOS) {
|
|
|
+ CLFCompareTaskResultVo clfCompareTaskResultVo = new CLFCompareTaskResultVo();
|
|
|
+ clfCompareTaskResultVo.setTaskno(CDo.getRwh());
|
|
|
+ ArrayList<Map<String, Object>> filedList = new ArrayList<>();
|
|
|
+ HashMap<String, Object> totalAmount = new HashMap<>();
|
|
|
+ HashMap<String, Object> totalCount = new HashMap<>();
|
|
|
+ HashMap<String, Object> unitPrice = new HashMap<>();
|
|
|
+ totalAmount.put("name", "totalAmount");
|
|
|
+ totalAmount.put("value", CDo.getTotalAmount());
|
|
|
+ totalCount.put("name", "totalCount");
|
|
|
+ totalCount.put("value", CDo.getTotalCount());
|
|
|
+ unitPrice.put("name", "unitPrice");
|
|
|
+ unitPrice.put("value", CDo.getUnitPrice());
|
|
|
+ filedList.add(totalAmount);
|
|
|
+ filedList.add(totalCount);
|
|
|
+ filedList.add(unitPrice);
|
|
|
+ clfCompareTaskResultVo.setTaskFiled(filedList);
|
|
|
+ taskVoList.add(clfCompareTaskResultVo);
|
|
|
+ }
|
|
|
+ clfCompareResultVO.setTaskVoList(taskVoList);
|
|
|
+ clfCompareResultVOS.add(clfCompareResultVO);
|
|
|
+ }
|
|
|
+ result.setResultVOList(clfCompareResultVOS);
|
|
|
+
|
|
|
+ return Result.OK(result);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 项目成本——材料费详情对比
|
|
|
+ */
|
|
|
+/* @ApiOperation(value="项目成本——材料费详情对比", notes="项目成本——材料费详情对比")
|
|
|
@GetMapping(value = "/compareCLFDetailList")
|
|
|
public List<CLFCompareListVO> compareCLFDetailList(String tasknos) {
|
|
|
List<String> tasknoList = Arrays.asList(tasknos.split(","));
|
|
|
@@ -98,11 +153,11 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
|
|
|
BigDecimal nbdj = bwlbmListVO.getNbdj(); //内部单价
|
|
|
BigDecimal sfzsl = bwlbmListVO.getSfzsl(); //实发主数量
|
|
|
|
|
|
- /*如果实发主数量为空，则给默认值0*/
|
|
|
+ *//*如果实发主数量为空，则给默认值0*//*
|
|
|
Optional<BigDecimal> sfzsl1 = Optional.ofNullable(sfzsl);
|
|
|
sfzsl = sfzsl1.orElse(BigDecimal.valueOf(0));
|
|
|
|
|
|
- /*计算：采购单价或内部单价*实发主数量 （若没有采购单价，则使用内部单价）*/
|
|
|
+ *//*计算：采购单价或内部单价*实发主数量 （若没有采购单价，则使用内部单价）*//*
|
|
|
BigDecimal wlf = BigDecimal.valueOf(0);
|
|
|
if (cgdj != null) {
|
|
|
wlf = cgdj.multiply(sfzsl);
|
|
|
@@ -130,143 +185,143 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
|
|
|
}
|
|
|
|
|
|
return bList;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 材料费详情
|
|
|
- */
|
|
|
- @ApiOperation(value="项目成本——材料费详情", notes="项目成本——材料费详情")
|
|
|
- @GetMapping(value = "/getCLFList")
|
|
|
- public List<WzOutboundOrderBDetailListVO> getCLFList(String taskno) {
|
|
|
-
|
|
|
- List<WzOutboundOrderBDetailListVO> bList = new ArrayList<>();
|
|
|
-
|
|
|
- QueryWrapper<WzOutboundOrderH> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.eq("rwh",taskno);
|
|
|
- List<WzOutboundOrderH> list =wzOutboundOrderHService.wzHlist(wrapper);
|
|
|
- List<WzOutboundOrderH> list1 = new ArrayList<>();
|
|
|
- if (list!=null && !list.isEmpty()) {
|
|
|
- for (WzOutboundOrderH h:list){
|
|
|
- //出库单号对应的物料单数量——大于5000被认为是异常数据，舍弃
|
|
|
- Integer count = bService.getckDetailDataCountByCkdh(h.getCkdh());
|
|
|
- if(count>5000) continue;
|
|
|
- list1.add(h);
|
|
|
- System.out.println(count);
|
|
|
- }
|
|
|
- if(!list1.isEmpty()){
|
|
|
- List<String> list2 = list1.stream().map(i->i.getCkdh()).collect(Collectors.toList());
|
|
|
- if(!list2.isEmpty()) bList = bService.wzDetailList(list2);
|
|
|
- }
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
- return bList;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 分页列表查询
|
|
|
- *
|
|
|
- * @param wzOutboundOrderH
|
|
|
- * @param pageNo
|
|
|
- * @param pageSize
|
|
|
- * @param req
|
|
|
- * @return
|
|
|
- */
|
|
|
- //@AutoLog(value = "物资出库单-分页列表查询")
|
|
|
- @ApiOperation(value="物资出库单-分页列表查询", notes="物资出库单-分页列表查询")
|
|
|
- @GetMapping(value = "/list")
|
|
|
- public Result<IPage<WzOutboundOrderH>> queryPageList(WzOutboundOrderH wzOutboundOrderH,
|
|
|
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
- HttpServletRequest req) {
|
|
|
- QueryWrapper<WzOutboundOrderH> queryWrapper = QueryGenerator.initQueryWrapper(wzOutboundOrderH, req.getParameterMap());
|
|
|
- Page<WzOutboundOrderH> page = new Page<WzOutboundOrderH>(pageNo, pageSize);
|
|
|
- IPage<WzOutboundOrderH> pageList = wzOutboundOrderHService.page(page, queryWrapper);
|
|
|
- return Result.OK(pageList);
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 添加
|
|
|
- *
|
|
|
- * @param wzOutboundOrderH
|
|
|
- * @return
|
|
|
- */
|
|
|
- @AutoLog(value = "物资出库单-添加")
|
|
|
- @ApiOperation(value="物资出库单-添加", notes="物资出库单-添加")
|
|
|
- //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:add")
|
|
|
- @PostMapping(value = "/add")
|
|
|
- public Result<String> add(@RequestBody WzOutboundOrderH wzOutboundOrderH) {
|
|
|
- wzOutboundOrderHService.save(wzOutboundOrderH);
|
|
|
- return Result.OK("添加成功！");
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 编辑
|
|
|
- *
|
|
|
- * @param wzOutboundOrderH
|
|
|
- * @return
|
|
|
- */
|
|
|
- @AutoLog(value = "物资出库单-编辑")
|
|
|
- @ApiOperation(value="物资出库单-编辑", notes="物资出库单-编辑")
|
|
|
- //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:edit")
|
|
|
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
|
|
- public Result<String> edit(@RequestBody WzOutboundOrderH wzOutboundOrderH) {
|
|
|
- wzOutboundOrderHService.updateById(wzOutboundOrderH);
|
|
|
- return Result.OK("编辑成功!");
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 通过id删除
|
|
|
- *
|
|
|
- * @param id
|
|
|
- * @return
|
|
|
- */
|
|
|
- @AutoLog(value = "物资出库单-通过id删除")
|
|
|
- @ApiOperation(value="物资出库单-通过id删除", notes="物资出库单-通过id删除")
|
|
|
- //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:delete")
|
|
|
- @DeleteMapping(value = "/delete")
|
|
|
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
|
|
- wzOutboundOrderHService.removeById(id);
|
|
|
- return Result.OK("删除成功!");
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 批量删除
|
|
|
- *
|
|
|
- * @param ids
|
|
|
- * @return
|
|
|
- */
|
|
|
- @AutoLog(value = "物资出库单-批量删除")
|
|
|
- @ApiOperation(value="物资出库单-批量删除", notes="物资出库单-批量删除")
|
|
|
- //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:deleteBatch")
|
|
|
- @DeleteMapping(value = "/deleteBatch")
|
|
|
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
|
|
- this.wzOutboundOrderHService.removeByIds(Arrays.asList(ids.split(",")));
|
|
|
- return Result.OK("批量删除成功!");
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 通过id查询
|
|
|
- *
|
|
|
- * @param id
|
|
|
- * @return
|
|
|
- */
|
|
|
- //@AutoLog(value = "物资出库单-通过id查询")
|
|
|
- @ApiOperation(value="物资出库单-通过id查询", notes="物资出库单-通过id查询")
|
|
|
- @GetMapping(value = "/queryById")
|
|
|
- public Result<WzOutboundOrderH> queryById(@RequestParam(name="id",required=true) String id) {
|
|
|
- WzOutboundOrderH wzOutboundOrderH = wzOutboundOrderHService.getById(id);
|
|
|
- if(wzOutboundOrderH==null) {
|
|
|
- return Result.error("未找到对应数据");
|
|
|
- }
|
|
|
- return Result.OK(wzOutboundOrderH);
|
|
|
- }
|
|
|
+ /**
|
|
|
+ * 材料费详情
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "项目成本——材料费详情", notes = "项目成本——材料费详情")
|
|
|
+ @GetMapping(value = "/getCLFList")
|
|
|
+ public List<WzOutboundOrderBDetailListVO> getCLFList(String taskno) {
|
|
|
+
|
|
|
+ List<WzOutboundOrderBDetailListVO> bList = new ArrayList<>();
|
|
|
+
|
|
|
+ QueryWrapper<WzOutboundOrderH> wrapper = new QueryWrapper<>();
|
|
|
+ wrapper.eq("rwh", taskno);
|
|
|
+ List<WzOutboundOrderH> list = wzOutboundOrderHService.wzHlist(wrapper);
|
|
|
+ List<WzOutboundOrderH> list1 = new ArrayList<>();
|
|
|
+ if (list != null && !list.isEmpty()) {
|
|
|
+ for (WzOutboundOrderH h : list) {
|
|
|
+ //出库单号对应的物料单数量——大于5000被认为是异常数据，舍弃
|
|
|
+ Integer count = bService.getckDetailDataCountByCkdh(h.getCkdh());
|
|
|
+ if (count > 5000) continue;
|
|
|
+ list1.add(h);
|
|
|
+ System.out.println(count);
|
|
|
+ }
|
|
|
+ if (!list1.isEmpty()) {
|
|
|
+ List<String> list2 = list1.stream().map(i -> i.getCkdh()).collect(Collectors.toList());
|
|
|
+ if (!list2.isEmpty()) bList = bService.wzDetailList(list2);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return bList;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 分页列表查询
|
|
|
+ *
|
|
|
+ * @param wzOutboundOrderH
|
|
|
+ * @param pageNo
|
|
|
+ * @param pageSize
|
|
|
+ * @param req
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ //@AutoLog(value = "物资出库单-分页列表查询")
|
|
|
+ @ApiOperation(value = "物资出库单-分页列表查询", notes = "物资出库单-分页列表查询")
|
|
|
+ @GetMapping(value = "/list")
|
|
|
+ public Result<IPage<WzOutboundOrderH>> queryPageList(WzOutboundOrderH wzOutboundOrderH,
|
|
|
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
+ HttpServletRequest req) {
|
|
|
+ QueryWrapper<WzOutboundOrderH> queryWrapper = QueryGenerator.initQueryWrapper(wzOutboundOrderH, req.getParameterMap());
|
|
|
+ Page<WzOutboundOrderH> page = new Page<WzOutboundOrderH>(pageNo, pageSize);
|
|
|
+ IPage<WzOutboundOrderH> pageList = wzOutboundOrderHService.page(page, queryWrapper);
|
|
|
+ return Result.OK(pageList);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 添加
|
|
|
+ *
|
|
|
+ * @param wzOutboundOrderH
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @AutoLog(value = "物资出库单-添加")
|
|
|
+ @ApiOperation(value = "物资出库单-添加", notes = "物资出库单-添加")
|
|
|
+ //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:add")
|
|
|
+ @PostMapping(value = "/add")
|
|
|
+ public Result<String> add(@RequestBody WzOutboundOrderH wzOutboundOrderH) {
|
|
|
+ wzOutboundOrderHService.save(wzOutboundOrderH);
|
|
|
+ return Result.OK("添加成功！");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 编辑
|
|
|
+ *
|
|
|
+ * @param wzOutboundOrderH
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @AutoLog(value = "物资出库单-编辑")
|
|
|
+ @ApiOperation(value = "物资出库单-编辑", notes = "物资出库单-编辑")
|
|
|
+ //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:edit")
|
|
|
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
|
|
|
+ public Result<String> edit(@RequestBody WzOutboundOrderH wzOutboundOrderH) {
|
|
|
+ wzOutboundOrderHService.updateById(wzOutboundOrderH);
|
|
|
+ return Result.OK("编辑成功!");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 通过id删除
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @AutoLog(value = "物资出库单-通过id删除")
|
|
|
+ @ApiOperation(value = "物资出库单-通过id删除", notes = "物资出库单-通过id删除")
|
|
|
+ //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:delete")
|
|
|
+ @DeleteMapping(value = "/delete")
|
|
|
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
|
|
|
+ wzOutboundOrderHService.removeById(id);
|
|
|
+ return Result.OK("删除成功!");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 批量删除
|
|
|
+ *
|
|
|
+ * @param ids
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @AutoLog(value = "物资出库单-批量删除")
|
|
|
+ @ApiOperation(value = "物资出库单-批量删除", notes = "物资出库单-批量删除")
|
|
|
+ //@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:deleteBatch")
|
|
|
+ @DeleteMapping(value = "/deleteBatch")
|
|
|
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
|
+ this.wzOutboundOrderHService.removeByIds(Arrays.asList(ids.split(",")));
|
|
|
+ return Result.OK("批量删除成功!");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 通过id查询
|
|
|
+ *
|
|
|
+ * @param id
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ //@AutoLog(value = "物资出库单-通过id查询")
|
|
|
+ @ApiOperation(value = "物资出库单-通过id查询", notes = "物资出库单-通过id查询")
|
|
|
+ @GetMapping(value = "/queryById")
|
|
|
+ public Result<WzOutboundOrderH> queryById(@RequestParam(name = "id", required = true) String id) {
|
|
|
+ WzOutboundOrderH wzOutboundOrderH = wzOutboundOrderHService.getById(id);
|
|
|
+ if (wzOutboundOrderH == null) {
|
|
|
+ return Result.error("未找到对应数据");
|
|
|
+ }
|
|
|
+ return Result.OK(wzOutboundOrderH);
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
- * 导出excel
|
|
|
- *
|
|
|
- * @param request
|
|
|
- * @param wzOutboundOrderH
|
|
|
- */
|
|
|
+ * 导出excel
|
|
|
+ *
|
|
|
+ * @param request
|
|
|
+ * @param wzOutboundOrderH
|
|
|
+ */
|
|
|
//@RequiresPermissions("org.jeecg.modules:wz_outbound_order_h:exportXls")
|
|
|
@RequestMapping(value = "/exportXls")
|
|
|
public ModelAndView exportXls(HttpServletRequest request, WzOutboundOrderH wzOutboundOrderH) {
|
|
|
@@ -274,12 +329,12 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 通过excel导入数据
|
|
|
- *
|
|
|
- * @param request
|
|
|
- * @param response
|
|
|
- * @return
|
|
|
- */
|
|
|
+ * 通过excel导入数据
|
|
|
+ *
|
|
|
+ * @param request
|
|
|
+ * @param response
|
|
|
+ * @return
|
|
|
+ */
|
|
|
//@RequiresPermissions("wz_outbound_order_h:importExcel")
|
|
|
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
|
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
lw