Skip to content

W
wios
提交 3ea281f5 作者: zhangqiliang
操作

发货管理和退货管理中涉及到更新操作的报错问题

父级 d154711f
正在显示 包含 295 行增加 和 27 行删除
src/main/java/com/starcharge/wios/controller/DeliveryController.java
...@@ -9,6 +9,7 @@ import com.starcharge.wios.dao.entity.WallboxApply; ...@@ -9,6 +9,7 @@ import com.starcharge.wios.dao.entity.WallboxApply;
import com.starcharge.wios.dao.mappers.DeliveryMapper; import com.starcharge.wios.dao.mappers.DeliveryMapper;
import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper; import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
import com.starcharge.wios.dao.mappers.WallboxApplyMapper; import com.starcharge.wios.dao.mappers.WallboxApplyMapper;
import com.starcharge.wios.dto.DeliveryUpdateDTO;
import com.starcharge.wios.enums2.ProductType; import com.starcharge.wios.enums2.ProductType;
import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum; import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
import com.starcharge.wios.service.CommonUpdateService; import com.starcharge.wios.service.CommonUpdateService;
...@@ -114,24 +115,24 @@ public class DeliveryController { ...@@ -114,24 +115,24 @@ public class DeliveryController {
@ApiOperation("更新发货单信息") @ApiOperation("更新发货单信息")
@ParamsValidate @ParamsValidate
@Transactional @Transactional
public BaseResponse<Delivery> update(@RequestBody @Validated(UpdateEntityGroup.class) Delivery delivery, BindingResult bindingResult){ public BaseResponse<DeliveryUpdateDTO> update(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
Delivery before=this.deliveryMapper.selectByPrimaryKey(delivery.getId()); Delivery before=this.deliveryMapper.selectByPrimaryKey(deliveryUpdateDTO.getId());
if(StringUtils.hasLength(before.getInstallOrder())&&!before.getInstallOrder().equals(delivery.getInstallOrder())){ if(StringUtils.hasLength(before.getInstallOrder())&&!before.getInstallOrder().equals(deliveryUpdateDTO.getInstallOrder())){
if(!ProductType.辅材.name().equals(delivery)){ if(!ProductType.辅材.name().equals(deliveryUpdateDTO)){
this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("0",before.getInstallOrder()); this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("0",before.getInstallOrder());
this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",delivery.getInstallOrder()); this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",deliveryUpdateDTO.getInstallOrder());
}else{ }else{
this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.未发货.name(),before.getInstallOrder()); this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.未发货.name(),before.getInstallOrder());
this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.已发货.name(),delivery.getInstallOrder()); this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.已发货.name(),deliveryUpdateDTO.getInstallOrder());
} }
} }
if(StringUtils.isEmpty(delivery.getLogisticOrder())){ if(StringUtils.isEmpty(deliveryUpdateDTO.getLogisticOrder())){
delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name()); deliveryUpdateDTO.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name());
}else{ }else{
delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name()); deliveryUpdateDTO.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
} }
this.commonUpdateService.UpdateColumns(delivery,false); this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(delivery)); return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
} }
@PostMapping("/export") @PostMapping("/export")
......
src/main/java/com/starcharge/wios/controller/RejectController.java
...@@ -9,6 +9,7 @@ import com.starcharge.wios.dao.entity.Delivery; ...@@ -9,6 +9,7 @@ import com.starcharge.wios.dao.entity.Delivery;
import com.starcharge.wios.dao.entity.Reject; import com.starcharge.wios.dao.entity.Reject;
import com.starcharge.wios.dao.mappers.DeliveryMapper; import com.starcharge.wios.dao.mappers.DeliveryMapper;
import com.starcharge.wios.dao.mappers.RejectMapper; import com.starcharge.wios.dao.mappers.RejectMapper;
import com.starcharge.wios.dto.DeliveryUpdateDTO;
import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum; import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
import com.starcharge.wios.service.CommonUpdateService; import com.starcharge.wios.service.CommonUpdateService;
import com.starcharge.wios.service.SnowFlakeService; import com.starcharge.wios.service.SnowFlakeService;
...@@ -58,7 +59,7 @@ public class RejectController { ...@@ -58,7 +59,7 @@ public class RejectController {
@Autowired @Autowired
private DeliveryMapper deliveryMapper; private DeliveryMapper deliveryMapper;
@PostMapping("/add") /* @PostMapping("/add")
@ApiOperation(value = "申请退货") @ApiOperation(value = "申请退货")
@ParamsValidate @ParamsValidate
public BaseResponse<Integer> AddReject(@RequestBody @Validated(CreateEntityGroup.class) RejectAddVo rejectAddVo, BindingResult bindingResult){ public BaseResponse<Integer> AddReject(@RequestBody @Validated(CreateEntityGroup.class) RejectAddVo rejectAddVo, BindingResult bindingResult){
...@@ -76,7 +77,7 @@ public class RejectController { ...@@ -76,7 +77,7 @@ public class RejectController {
reject.setStatus(TauxiliarymaterialStatusEnum.已申请.name()); reject.setStatus(TauxiliarymaterialStatusEnum.已申请.name());
this.commonUpdateService.UpdateColumns(reject,true); this.commonUpdateService.UpdateColumns(reject,true);
return new BaseResponse<>(this.rejectMapper.insertSelective(reject)); return new BaseResponse<>(this.rejectMapper.insertSelective(reject));
} }*/
@PostMapping("/query") @PostMapping("/query")
@ApiOperation(value = "退货列表查询") @ApiOperation(value = "退货列表查询")
public BaseResponse<List<Delivery>> queryReject(Delivery Delivery){ public BaseResponse<List<Delivery>> queryReject(Delivery Delivery){
...@@ -96,18 +97,18 @@ public class RejectController { ...@@ -96,18 +97,18 @@ public class RejectController {
} }
return new BaseResponse(delivery); return new BaseResponse(delivery);
} }
@GetMapping("/delete") /* @GetMapping("/delete")
@ApiOperation(value = "删除退货信息") @ApiOperation(value = "删除退货信息")
public BaseResponse<Integer> delete(@RequestParam int id){ public BaseResponse<Integer> delete(@RequestParam int id){
return new BaseResponse(this.rejectMapper.deleteByPrimaryKey(id)); return new BaseResponse(this.rejectMapper.deleteByPrimaryKey(id));
} }*/
@PostMapping("/update") @PostMapping("/update")
@ApiOperation("更新退货单信息") @ApiOperation("更新退货单信息")
@ParamsValidate @ParamsValidate
public BaseResponse<Reject> update(@RequestBody @Validated(UpdateEntityGroup.class) Delivery delivery, BindingResult bindingResult){ public BaseResponse<DeliveryUpdateDTO> update(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
//var data=RejectConvert.INSTANCE.convertAddVo(rejectAddVo); //var data=RejectConvert.INSTANCE.convertAddVo(rejectAddVo);
this.commonUpdateService.UpdateColumns(delivery,false); this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(delivery)); return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
} }
/*@PostMapping("/export") /*@PostMapping("/export")
...@@ -124,18 +125,18 @@ public class RejectController { ...@@ -124,18 +125,18 @@ public class RejectController {
@PostMapping("/check") @PostMapping("/check")
@ApiOperation("审批退货单") @ApiOperation("审批退货单")
@ParamsValidate @ParamsValidate
public BaseResponse<Boolean> check(@RequestBody @Validated Delivery delivery,BindingResult bindingResult){ public BaseResponse<Boolean> check(@RequestBody @Validated DeliveryUpdateDTO deliveryUpdateDTO,BindingResult bindingResult){
var status=TauxiliarymaterialStatusEnum.getEnumByName(0,delivery.getStatus()); var status=TauxiliarymaterialStatusEnum.getEnumByName(0,deliveryUpdateDTO.getStatus());
if(status==null){ if(status==null){
throw new ServiceException(400,"status必须是枚举："+TauxiliarymaterialStatusEnum.getStatusTypeEnums(0).stream().map(e->e.name()).reduce("",(a,b)->a+","+b)); throw new ServiceException(400,"status必须是枚举："+TauxiliarymaterialStatusEnum.getStatusTypeEnums(0).stream().map(e->e.name()).reduce("",(a,b)->a+","+b));
} }
SessionInfo sessionInfo = tokenService.getUser(); SessionInfo sessionInfo = tokenService.getUser();
//var data=RejectConvert.INSTANCE.convertCheckVo(rejectCheckVo); //var data=RejectConvert.INSTANCE.convertCheckVo(rejectCheckVo);
delivery.setCheckUser(sessionInfo.getUserId()); deliveryUpdateDTO.setCheckUser(sessionInfo.getUserId());
delivery.setCheckUserName(sessionInfo.getUserName()); deliveryUpdateDTO.setCheckUserName(sessionInfo.getUserName());
delivery.setCheckTime(LocalDateTime.now()); deliveryUpdateDTO.setCheckTime(LocalDateTime.now());
this.commonUpdateService.UpdateColumns(delivery,false); this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(delivery)); return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
} }
......
src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.java
...@@ -2,6 +2,7 @@ package com.starcharge.wios.dao.mappers; ...@@ -2,6 +2,7 @@ package com.starcharge.wios.dao.mappers;
import com.starcharge.wios.dao.entity.Delivery; import com.starcharge.wios.dao.entity.Delivery;
import com.starcharge.wios.dao.entity.DeliveryCriteria; import com.starcharge.wios.dao.entity.DeliveryCriteria;
import com.starcharge.wios.dto.DeliveryUpdateDTO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -25,7 +26,7 @@ public interface DeliveryMapper { ...@@ -25,7 +26,7 @@ public interface DeliveryMapper {
int updateByExample(@Param("record") Delivery record, @Param("example") DeliveryCriteria example); int updateByExample(@Param("record") Delivery record, @Param("example") DeliveryCriteria example);
int updateByPrimaryKeySelective(Delivery record); int updateByPrimaryKeySelective(DeliveryUpdateDTO record);
int updateByPrimaryKey(Delivery record); int updateByPrimaryKey(Delivery record);
......
src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.starcharge.wios.dao.entity.Delivery"> <update id="updateByPrimaryKeySelective" parameterType="com.starcharge.wios.dto.DeliveryUpdateDTO">
update t_delivery update t_delivery
<set> <set>
<if test="deliveryOrder != null"> <if test="deliveryOrder != null">
......
src/main/java/com/starcharge/wios/dto/DeliveryUpdateDTO.java 0 → 100644
package com.starcharge.wios.dto;
import com.starcharge.wios.validation.CreateEntityGroup;
import com.starcharge.wios.validation.UpdateEntityGroup;
import com.starcharge.wios.vo.PageVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
/**
*@author:zhangqiliang
*@time:2023-11-22
*/
@Data
@ApiModel(value="DeliveryUpdateDTO", description="发货单的更新")
public class DeliveryUpdateDTO{
/**
* id
*
* @mbg.generated
*/
@ApiModelProperty(required = true,value = "id")
@NotNull(groups = UpdateEntityGroup.class )
@Min(value = 1,groups = UpdateEntityGroup.class)
private Integer id;
/**
* 发货单号
*
* @mbg.generated
*/
@ApiModelProperty(value = "发货单号")
private String deliveryOrder;
/**
* 安装单号
*
* @mbg.generated
*/
@ApiModelProperty(value = "安装单号")
private String installOrder;
/**
* 产品批次
*
* @mbg.generated
*/
@ApiModelProperty(value = "产品批次")
private String productBatch;
/**
* 发货数量
*
* @mbg.generated
*/
@ApiModelProperty(value = "发货数量")
private Integer quantity;
/**
* 物料类别
*
* @mbg.generated
*/
@ApiModelProperty(value = "物料类别")
private String materialCategory;
/**
* 物料编码
*
* @mbg.generated
*/
@ApiModelProperty(value = "物料编码")
private String materialCode;
/**
* 物料名称
*
* @mbg.generated
*/
@ApiModelProperty(value = "物料名称")
private String materialName;
/**
* 物料厂商
*
* @mbg.generated
*/
@ApiModelProperty(value = "物料厂商")
private String materialCompany;
/**
* 物流单号
*
* @mbg.generated
*/
@ApiModelProperty(value = "物流单号")
private String logisticOrder;
/**
* 物流服务商
*
* @mbg.generated
*/
@ApiModelProperty(value = "物流服务商")
private String logisticCompany;
/**
* 物流状态 未发货 已发货
*
* @mbg.generated
*/
@ApiModelProperty(value = "物流状态 未发货 已发货")
private String logisticStatus;
/**
* 申请团队
*
* @mbg.generated
*/
@ApiModelProperty(value = "申请团队")
private String team;
/**
* 是否产品或辅料
*
* @mbg.generated
*/
@ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
@NotNull(groups = CreateEntityGroup.class)
private String isproduct;
/**
* 创建人
*
* @mbg.generated
*/
@ApiModelProperty(value = "创建人")
private String createdBy;
/**
* 创建时间
*
* @mbg.generated
*/
@ApiModelProperty(value = "创建时间")
private LocalDateTime createdTime;
/**
* 更新人
*
* @mbg.generated
*/
@ApiModelProperty(value = "更新人")
private String updatedBy;
/**
* 更新时间
*
* @mbg.generated
*/
@ApiModelProperty(value = "更新时间")
private LocalDateTime updatedTime;
/**
* 到货仓库
*
* @mbg.generated
*/
@ApiModelProperty(value = "到货仓库")
private String arrivalWarehouse;
/**
* 到货仓库id
*
* @mbg.generated
*/
@ApiModelProperty(value = "到货仓库id")
private String arrivalWarehouseId;
/**
* 收货人
*
* @mbg.generated
*/
@ApiModelProperty(value = "收货人")
private String receiver;
/**
* 申请表
*
* @mbg.generated
*/
@ApiModelProperty(value = "申请表")
private String remarks;
/**
* 退货材料
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货材料")
private String rejectMaterial;
/**
* 退货材料数组
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货材料数组")
private List<String> rejectMaterialList;
/**
* 退货原因
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货原因")
private String reason;
/**
* 退货状态 已申请 已驳回 已通过 已关闭
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货状态 已申请 已驳回 已通过 已关闭")
private String status;
/**
* 退货的审批时间
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货的审批时间")
private LocalDateTime checkTime;
/**
* 退货的审核人
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货的审核人")
private String checkUser;
/**
* 退货的审核人姓名
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货的审核人姓名")
private String checkUserName;
/**
* 退货的审核意见
*
* @mbg.generated
*/
@ApiModelProperty(value = "退货的审核意见")
private String checkSuggestion;
/**
* 车企单号
*
* @mbg.generated
*/
@ApiModelProperty(value = "车企单号")
private String outOrderId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论