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());
@@ -11,6 +11,7 @@ import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.service.AsnOrderService; import com.vincent.rsf.server.system.constant.SerialRuleCode; @@ -160,7 +161,8 @@ if (Objects.isNull(params)) { return R.error("参数不能为空！！"); } return asnOrderService.saveOrderAndItems(params); return asnOrderService.saveOrderAndItems(params, getLoginUserId()); } @ApiOperation("单据信息修改") @@ -170,6 +172,22 @@ if (Objects.isNull(params)) { return R.error("参数不能为空！！"); } return asnOrderService.updateOrderItem(params); return asnOrderService.updateOrderItem(params, getLoginUserId()); } @ApiOperation("单据批量修改") @PostMapping("/asnOrder/batch/update") @PreAuthorize("hasAuthority('manager:asnOrder:update')") public R batchUpdate(@RequestBody BatchUpdateParam params) { if (Objects.isNull(params)) { return R.error("参数不能为空！！"); } if (Objects.isNull(params.getOrder())) { return R.error("修改参数不能为空！！"); } if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) { return R.error("修改ID不能为空！！"); } return R.ok(asnOrderService.batchUpdate(params, getLoginUserId())); } } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -11,6 +11,7 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate; @@ -74,8 +75,8 @@ return R.error("Save Fail"); } return R.ok("Save Success"); } @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") @OperationLog("Update ASN单据") @@ -144,13 +145,15 @@ @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception { if (Objects.isNull(file)) { throw new CoolException("文件不能为空！！"); R.error("文件不能为空！！"); } HashMap<String, Object> hashMap = new HashMap<>(); if (!Objects.isNull(asnId)) { hashMap.put("asnId", asnId); } return asnOrderItemService.excelImport(file, hashMap); } } 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) { @@ -104,9 +103,7 @@ @PostMapping("/qlyInspect/save") public R save(@RequestBody QlyInspect qlyInspect) { qlyInspect.setCreateBy(getLoginUserId()); qlyInspect.setCreateTime(new Date()); qlyInspect.setUpdateBy(getLoginUserId()); qlyInspect.setUpdateTime(new Date()); if (!qlyInspectService.save(qlyInspect)) { return R.error("Save Fail"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/BatchUpdateParam.java
New file @@ -0,0 +1,24 @@ package com.vincent.rsf.server.manager.controller.params; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; import java.util.List; @Data @Accessors(chain = true) @ApiModel(value = "BatchUpdateParam", description = "批量修改参数") public class BatchUpdateParam implements Serializable { @ApiModelProperty("修改参数") private AsnOrder order; @ApiModelProperty("ids") private List<Long> ids; } rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -110,11 +110,9 @@ @ApiModelProperty(value= "释放状态 0: 正常 1: 已释放 ") private Short rleStatus; /** * 名称 */ // @ApiModelProperty(value= "名称") // private String name; @ApiModelProperty("执行状态") private Short exceStatus; /** * 状态 1: 正常 0: 冻结 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -360,7 +360,7 @@ MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class); MatnrGroup matnrGroup = service.getById(this.groupId); if (!Cools.isEmpty(matnrGroup)){ return String.valueOf(matnrGroup.getCode()); return String.valueOf(matnrGroup.getName()); } return null; } 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/AsnOrderItemService.java
@@ -6,6 +6,7 @@ import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import org.springframework.web.multipart.MultipartFile; @@ -24,4 +25,5 @@ R generateBarcode(List<Long> orders); IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import java.util.List; @@ -14,7 +15,10 @@ List<AsnOrder> getListByMatnr(Map<String, String> params); R saveOrderAndItems(AsnOrderAndItemsParams params); R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId); R updateOrderItem(AsnOrderAndItemsParams params); R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId); boolean batchUpdate(BatchUpdateParam params, Long loginUserId); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; @@ -13,6 +14,7 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate; import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper; @@ -130,4 +132,5 @@ return hsahMap; } } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -2,14 +2,15 @@ import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.api.entity.dto.PoItemsDto; import com.vincent.rsf.server.api.service.ReceiveMsgService; import com.vincent.rsf.server.api.service.ReportMsgService; import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper; import com.vincent.rsf.server.manager.mapper.AsnOrderMapper; import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.mapper.PurchaseMapper; @@ -17,7 +18,6 @@ import com.vincent.rsf.server.manager.service.AsnOrderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.entity.SerialRule; import com.vincent.rsf.server.system.mapper.SerialRuleMapper; import com.vincent.rsf.server.system.utils.SerialRuleUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -84,7 +84,7 @@ } @Override public R saveOrderAndItems(AsnOrderAndItemsParams params) { public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) { if (Objects.isNull(params.getOrders())) { throw new CoolException("主单信息不能为空"); } @@ -96,7 +96,9 @@ if (Objects.isNull(ruleCode)) { throw new CoolException("收货通知单编码生成失败！！"); } orders.setCode(ruleCode); orders.setCode(ruleCode) .setUpdateBy(loginUserId) .setCreateBy(loginUserId); if (!this.save(orders)) { throw new CoolException("主单保存失败！！"); } @@ -107,6 +109,8 @@ item.put("asnId", orders.getId()); item.put("asnCode", orders.getCode()); item.put("poCode", orders.getPoCode()); item.put("createBy", loginUserId); item.put("updateBy", loginUserId); if (!asnOrderItemService.fieldsSave(item)) { throw new CoolException("明细保存失败！！"); } @@ -116,12 +120,14 @@ /** * 表单明细修改 * * @param params * @param loginUserId * @return */ @Override @Transactional public R updateOrderItem(AsnOrderAndItemsParams params) { public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) { if (Objects.isNull(params.getOrders())) { throw new CoolException("主单信息不能为空！！"); } @@ -141,4 +147,28 @@ } return R.ok("修改完成！！"); } /** * @author Ryan * @description 批量修改 * @param * @return * @time 2025/4/1 07:58 */ @Override public boolean batchUpdate(BatchUpdateParam params, Long userId) { AsnOrder order = params.getOrder(); if (Objects.isNull(order)) { throw new CoolException("修改参数不能为空！！"); } return this.update(new LambdaUpdateWrapper<AsnOrder>() .in(AsnOrder::getId, params.getIds()) .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus()) .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus()) .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus()) .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType()) .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus()) .set(AsnOrder::getUpdateBy, userId)); } } 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();
