inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.mapper.ImportRepertoryMapper; import com.yuanchu.mom.mapper.InspectUnacceptedMapper; import com.yuanchu.mom.mapper.RepertoryMapper; import com.yuanchu.mom.pojo.FinishedInspect; import com.yuanchu.mom.mapper.FinishedInspectMapper; import com.yuanchu.mom.pojo.ImportRepertory; import com.yuanchu.mom.pojo.InspectUnaccepted; import com.yuanchu.mom.pojo.Repertory; import com.yuanchu.mom.service.FinishedInspectService; @@ -48,6 +50,9 @@ @Resource RepertoryMapper repertoryMapper; @Resource ImportRepertoryMapper importRepertoryMapper; @Override public Integer addProcessInspectionSheet(FinishedInspect finishedInspect) { finishedInspect.setType(0); @@ -69,8 +74,8 @@ updateWrapper.eq(FinishedInspect::getId, finishedInspectId); updateWrapper.set(FinishedInspect::getResult, result); finishedInspectMapper.update(new FinishedInspect(), updateWrapper); //如果检验结论为不合格,则需要新增不合格检验单,还需要新增半成品库存 FinishedInspect finishedInspect = finishedInspectMapper.selectById(finishedInspectId); //如果检验结论为不合格,则需要新增不合格检验单,还需要新增半成品库存 if (result == 0) { /*新增不合格检验单*/ InspectUnaccepted inspectUnaccepted = InspectUnaccepted.builder() @@ -109,8 +114,19 @@ repertoryMapper.insert(repertory); } } //如果检验合格,需要新增成品(0)库存 //如果检验合格,需要新增成品(0)库存和入库记录 if (result == 1) { /*新增成品入库记录*/ ImportRepertory importRepertory = ImportRepertory.builder() .orderCode(finishedInspect.getOrderNumber()) .code(finishedInspect.getMaterialCode()) .name(finishedInspect.getMaterial()) .specifications(finishedInspect.getSpecificationsModel()) .unit(finishedInspect.getUnit()) .number(finishedInspect.getQuantity()) .userName(username) .build(); importRepertoryMapper.insert(importRepertory); /*新增成品(0)库存*/ //如果入库的信息一样只有库存不一样,则在原来的库存数量上加上相应的数量 LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>(); inventory-server/src/main/java/com/yuanchu/mom/controller/ConsignmentController.java
@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import com.yuanchu.mom.service.ConsignmentService; @@ -61,7 +62,7 @@ @ApiOperation(value = "新增成品发货") @PostMapping("/addCon") public Result addCon(@RequestHeader("token") String token, @RequestBody ConsignmentDto consignmentDto) throws Exception { public Result addCon(@RequestHeader("token") String token, @Validated @RequestBody ConsignmentDto consignmentDto) throws Exception { Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class); return Result.success(consignmentService.addCon(data.get("name").replaceAll("\"", ""), consignmentDto)); } inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto.java
@@ -6,6 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.NotBlank; import java.util.List; @@ -13,41 +14,51 @@ @NoArgsConstructor @AllArgsConstructor @Builder //新增成品发货 public class ConsignmentDto { //订单编号 @NotBlank(message = "订单编号不能为空") @JsonSerialize private String orderCode; //合同编号 @NotBlank(message = "合同编号不能为空") @JsonSerialize private String customerCode; //客户名称 @NotBlank(message = "客户名称不能为空") @JsonSerialize private String proname; //到货地址 @NotBlank(message = "到货地址不能为空") @JsonSerialize private String adress; //收货联系人 @NotBlank(message = "收货联系人不能为空") @JsonSerialize private String username; //手机号 @NotBlank(message = "手机号不能为空") @JsonSerialize private String phone ; //产品信息 @NotBlank(message = "产品信息不能为空") @JsonSerialize private List<ConsignmentDto2> messages; //检查人员 @NotBlank(message = "检查人员不能为空") @JsonSerialize private String checkName; //装配人员 @NotBlank(message = "装配人员不能为空") @JsonSerialize private String fitName; }
