rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -217,6 +217,9 @@ if (Objects.isNull(orderItem)) { throw new CoolException("通知单明细不存在!!"); } if (Objects.isNull(dto.getReceiptQty()) || Double.compare(dto.getReceiptQty(), 0.0) == 0) { throw new CoolException("收货数量不能为零!!"); } orderItem.setQty(dto.getReceiptQty()) .setProdTime(dto.getProdTime()); rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -80,7 +80,6 @@ return qlyInspectService.saveSelected(param, loginUserId); } @PreAuthorize("hasAuthority('manager:qlyInspect:list')") @PostMapping("/qlyInspect/list") public R list(@RequestBody Map<String, Object> map) { rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -43,6 +43,9 @@ @ApiModelProperty(value= "主单ID") private Long ispectId; @ApiModelProperty("质检单状态") private String isptStatus; @ApiModelProperty("单据明细ID") private Long asnItemId; @@ -214,6 +217,18 @@ // null // 备注 // ); public String getIsptStatus$() { if (null == this.isptStatus) {return null; } DictDataService dictDataService = SpringUtils.getBean(DictDataService.class); DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>() .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS) .eq(DictData::getValue, this.isptStatus)); if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) { return null; } return dictDatas.getLabel(); } public String getIsptResult$() { if (null == this.isptResult) {return null; } DictDataService dictDataService = SpringUtils.getBean(DictDataService.class); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -117,17 +117,6 @@ } } } // IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, queryWrapper); // /**获取物料分页信息 */ // List<Map<String, Object>> mapList = reulst.getRecords(); // if (!mapList.isEmpty()) { // mapList.forEach(map -> { // if (!Objects.isNull(map.get("fieldsIndex"))) { // FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString()); // } // }); // } /**拼接扩展字段*/ PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper); List<Matnr> records = page.getRecords();