Skip to content

W
wios
提交 e341389e 作者: 李超杰
操作

辅材发货单导入

父级 976a708b
正在显示 包含 121 行增加 和 132 行删除
src/main/java/com/starcharge/wios/Import/impl/AuxiliaryMaterialDeliveryImport.java
package com.starcharge.wios.Import.impl; package com.starcharge.wios.Import.impl;
import com.starcharge.wios.Import.Import; import com.starcharge.wios.Import.Import;
import com.starcharge.wios.dao.entity.Order;
import com.starcharge.wios.dao.entity.Tauxiliarymaterials; import com.starcharge.wios.dao.entity.Tauxiliarymaterials;
import com.starcharge.wios.dao.mappers.OrderMapper; import com.starcharge.wios.dao.mappers.OrderMapper;
import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper; import com.starcharge.wios.dao.mappers.TauxiliarymaterialsMapper;
import com.starcharge.wios.enums2.ProductType;
import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum; import com.starcharge.wios.enums2.TauxiliarymaterialStatusEnum;
import com.starcharge.wios.validation.CreateEntityGroup;
import com.starcharge.wios.vo.DeliveryAddVo; import com.starcharge.wios.vo.DeliveryAddVo;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -42,55 +39,42 @@ public class AuxiliaryMaterialDeliveryImport implements Import { ...@@ -42,55 +39,42 @@ public class AuxiliaryMaterialDeliveryImport implements Import {
@Override @Override
public List<?> handle(List<Object> list) { public List<?> handle(List<Object> list) {
// List<String> headList = (List<String>)list.get(0); for (int i = 1; i < list.size(); i++) {
for(int i=1;i<list.size();i++){ StringBuilder error = new StringBuilder();
List<String> rowdata = (List<String>)list.get(i); List<String> rowdata = (List<String>) list.get(i);
DeliveryAddVo deliveryAddVo=new DeliveryAddVo(); DeliveryAddVo deliveryAddVo = new DeliveryAddVo();
deliveryAddVo.setInstallOrder(rowdata.get(0)); deliveryAddVo.setInstallOrder(rowdata.get(0));
deliveryAddVo.setLogisticOrder(rowdata.get(1)); deliveryAddVo.setLogisticOrder(rowdata.get(1));
try { try {
deliveryAddVo.setQuantity(Integer.parseInt(rowdata.get(2))); deliveryAddVo.setQuantity(Integer.parseInt(rowdata.get(2)));
}catch (Exception e){ } catch (Exception e) {
rowdata.add("error:发货数量必填且为整数"); error.append("error:发货数量必填且为整数");
} }
// deliveryAddVo.setMaterialCode(rowdata.get(1));
// deliveryAddVo.setMaterialName(rowdata.get(2));
// deliveryAddVo.setMaterialCompany(rowdata.get(3));
// deliveryAddVo.setLogisticOrder(rowdata.get(4));
// deliveryAddVo.setTeam(rowdata.get(5));
Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class); Set<ConstraintViolation<DeliveryAddVo>> sets = validator.validate(deliveryAddVo, AuxiliaryMaterialDeliveryImport.AuxiliaryBatchCreateEntityGroup.class);
if(!sets.isEmpty()){ if (!sets.isEmpty()) {
rowdata.add(sets.stream().map(ConstraintViolation::getMessage).reduce("error:",(s1,s2)->s1+";"+s2)); error.append(sets.stream().map(ConstraintViolation::getMessage).reduce("error:", (s1, s2) -> s1 + ";" + s2));
continue;
} }
Tauxiliarymaterials tauxiliarymaterialsquery=new Tauxiliarymaterials(); Tauxiliarymaterials tauxiliarymaterialsquery = new Tauxiliarymaterials();
tauxiliarymaterialsquery.setApplyOrder(deliveryAddVo.getInstallOrder()); tauxiliarymaterialsquery.setApplyOrder(deliveryAddVo.getInstallOrder());
tauxiliarymaterialsquery.setApplyStatus(TauxiliarymaterialStatusEnum.已通过.name()); tauxiliarymaterialsquery.setApplyStatus(TauxiliarymaterialStatusEnum.已通过.name());
List<Tauxiliarymaterials> tauxiliarymaterials=this.tauxiliarymaterialsMapper.selectTAuxiliaryMaterialsList(tauxiliarymaterialsquery); List<Tauxiliarymaterials> tauxiliarymaterials = this.tauxiliarymaterialsMapper.selectTAuxiliaryMaterialsList(tauxiliarymaterialsquery);
if(CollectionUtils.isEmpty(tauxiliarymaterials)){ if (CollectionUtils.isEmpty(tauxiliarymaterials)) {
rowdata.add("error:找不到已审批通过辅材申请单"); error.append("error:找不到已审批通过辅材申请单");
continue; } else {
} Tauxiliarymaterials tauxiliarymaterial = tauxiliarymaterials.stream().filter(t -> TauxiliarymaterialStatusEnum.未发货.name().equals(t.getLogisticStatus())).findFirst().orElse(null);
Tauxiliarymaterials tauxiliarymaterial= tauxiliarymaterials.stream().filter(t->TauxiliarymaterialStatusEnum.未发货.name().equals(t.getLogisticStatus())).findFirst().orElse(null); if (tauxiliarymaterial == null) {
if(tauxiliarymaterial==null){ error.append("error:找不到已审批且未发货的辅材申请单");
rowdata.add(""); } else {
rowdata.add(""); if (!StringUtils.hasLength(tauxiliarymaterial.getApprovedQuantity())) {
rowdata.add("");
rowdata.add("error:找不到已审批且未发货的辅材申请单");
}else{
rowdata.add(tauxiliarymaterial.getMaterialCode());
rowdata.add(tauxiliarymaterial.getMaterialName());
rowdata.add(tauxiliarymaterial.getApprovedQuantity());
if(!StringUtils.hasLength(tauxiliarymaterial.getApprovedQuantity())){
tauxiliarymaterial.setApprovedQuantity("0"); tauxiliarymaterial.setApprovedQuantity("0");
} }
if(deliveryAddVo.getQuantity()>Float.parseFloat(tauxiliarymaterial.getApprovedQuantity())){ if (deliveryAddVo.getQuantity() > Integer.parseInt(tauxiliarymaterial.getApprovedQuantity())) {
rowdata.add("error:发货数量大于已审批数量"); error.append("error:发货数量大于已审批数量");
} }
} }
}
rowdata.add(error.toString());
} }
return list; return list;
} }
......
src/main/java/com/starcharge/wios/Import/impl/AuxiliarymaterialsCheckImport.java
...@@ -27,42 +27,45 @@ public class AuxiliarymaterialsCheckImport implements Import { ...@@ -27,42 +27,45 @@ public class AuxiliarymaterialsCheckImport implements Import {
public List<?> handle(List<Object> list) { public List<?> handle(List<Object> list) {
for (int i = 1; i < list.size(); i++) { for (int i = 1; i < list.size(); i++) {
List<String> rowdata = (List<String>) list.get(i); List<String> rowdata = (List<String>) list.get(i);
StringBuilder error = new StringBuilder();
if (rowdata.size() < 2 || StringUtils.isEmpty(rowdata.get(1))) { if (rowdata.size() < 2 || StringUtils.isEmpty(rowdata.get(1))) {
rowdata.add("error:批准数量不能为空"); error.append("error:批准数量不能为空");
continue;
} }
try { try {
Float.parseFloat(rowdata.get(1)); Float.parseFloat(rowdata.get(1));
} catch (Exception e) { } catch (Exception e) {
rowdata.add("error:批准数量必须是数字"); error.append("error:批准数量必须是数字");
continue; rowdata.add(5, error.toString());
} }
String s = rowdata.get(1); String s = rowdata.get(1);
rowdata.remove(1); rowdata.remove(1);
if (StringUtils.isEmpty(rowdata.get(0))) { if (StringUtils.isEmpty(rowdata.get(0))) {
rowdata.add("error:申请单号不能为空"); error.append("error:申请单号不能为空");
continue; rowdata.add(5, error.toString());
} }
String materialCode = null;
String materialName = null;
String applyQuantity = null;
Tauxiliarymaterials exist = this.tauxiliarymaterialsMapper.selectByApplyOrder(rowdata.get(0)); Tauxiliarymaterials exist = this.tauxiliarymaterialsMapper.selectByApplyOrder(rowdata.get(0));
if (Objects.isNull(exist)) { if (Objects.isNull(exist)) {
rowdata.add("error:找不到辅材申请单"); error.append("error:找不到辅材申请单");
continue; } else {
} materialCode = exist.getMaterialCode();
materialName = exist.getMaterialName();
applyQuantity = exist.getApplyQuantity();
TauxiliarymaterialStatusEnum enumByName = TauxiliarymaterialStatusEnum.getEnumByName(0, exist.getApplyStatus()); TauxiliarymaterialStatusEnum enumByName = TauxiliarymaterialStatusEnum.getEnumByName(0, exist.getApplyStatus());
if (Objects.nonNull(enumByName) && enumByName.getValue() != 1) { if (Objects.nonNull(enumByName) && enumByName.getValue() != 1) {
rowdata.add("error:辅材申请单:" + exist.getApplyOrder() + " 状态必须是已申请"); error.append("error:辅材申请单:").append(exist.getApplyOrder()).append(" 状态必须是已申请");
continue;
} }
if (Integer.parseInt(s) > Integer.parseInt(exist.getApplyQuantity())) { if (Integer.parseInt(s) > Integer.parseInt(exist.getApplyQuantity())) {
rowdata.add("error:批准数量不能大于申请数量"); error.append("error:批准数量不能大于申请数量");
continue;
} }
}
rowdata.add(exist.getMaterialCode()); rowdata.add(materialCode);
rowdata.add(exist.getMaterialName()); rowdata.add(materialName);
rowdata.add(exist.getApplyQuantity()); rowdata.add(applyQuantity);
rowdata.add(s); rowdata.add(s);
rowdata.add(error.toString());
} }
return list; return list;
} }
......
src/main/java/com/starcharge/wios/controller/DeliveryController.java
...@@ -15,11 +15,9 @@ import com.starcharge.wios.dao.mappers.DeliveryMapper; ...@@ -15,11 +15,9 @@ 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.dto.DeliveryUpdateDTO;
import com.starcharge.wios.enums2.LogisticStatus;
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;
import com.starcharge.wios.service.SnowFlakeService;
import com.starcharge.wios.utils.ExcelUtils; import com.starcharge.wios.utils.ExcelUtils;
import com.starcharge.wios.utils.NumberUtil; import com.starcharge.wios.utils.NumberUtil;
import com.starcharge.wios.validation.CreateEntityGroup; import com.starcharge.wios.validation.CreateEntityGroup;
...@@ -27,7 +25,6 @@ import com.starcharge.wios.validation.ParamsValidate; ...@@ -27,7 +25,6 @@ import com.starcharge.wios.validation.ParamsValidate;
import com.starcharge.wios.validation.UpdateEntityGroup; import com.starcharge.wios.validation.UpdateEntityGroup;
import com.starcharge.wios.vo.DeliveryAddVo; import com.starcharge.wios.vo.DeliveryAddVo;
import com.starcharge.wios.vo.DeliveryExcelVo; import com.starcharge.wios.vo.DeliveryExcelVo;
import io.netty.util.internal.StringUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -69,109 +66,111 @@ public class DeliveryController { ...@@ -69,109 +66,111 @@ public class DeliveryController {
private String detailUrl; private String detailUrl;
@Autowired @Autowired
private OrderDao orderDao; private OrderDao orderDao;
@PostMapping("/add") @PostMapping("/add")
@ApiOperation(value = "新增发货",notes = "新增发货，返回成功条数") @ApiOperation(value = "新增发货", notes = "新增发货，返回成功条数")
@ParamsValidate @ParamsValidate
@Transactional @Transactional
public BaseResponse<Integer> AddDelivery(@RequestBody @Validated(CreateEntityGroup.class) List<DeliveryAddVo> deliveryAddVoList, BindingResult bindingResult){ public BaseResponse<Integer> AddDelivery(@RequestBody @Validated(CreateEntityGroup.class) List<DeliveryAddVo> deliveryAddVoList, BindingResult bindingResult) {
//String orderid= snowFlakeService.getNextId(0,0)+""; //String orderid= snowFlakeService.getNextId(0,0)+"";
return new BaseResponse(deliveryAddVoList.stream() return new BaseResponse(deliveryAddVoList.stream()
.map(da->{ .map(da -> {
//SN号不能重复 //SN号不能重复
if (!StringUtils.isEmpty(da.getMaterialSn())){ if (!StringUtils.isEmpty(da.getMaterialSn())) {
Delivery delivery=this.deliveryMapper.selectByMaterialSn(da.getMaterialSn()); Delivery delivery = this.deliveryMapper.selectByMaterialSn(da.getMaterialSn());
if (!StringUtils.isEmpty(delivery)){ if (!StringUtils.isEmpty(delivery)) {
throw new ServiceException("当前SN号已经录入使用"); throw new ServiceException("当前SN号已经录入使用");
} }
} }
da.setInstallStatus(0); da.setInstallStatus(0);
Delivery delivery= DeliveryConvert.INSTANCE.convertAddVo(da); Delivery delivery = DeliveryConvert.INSTANCE.convertAddVo(da);
delivery.setDeliveryOrder("FH"+NumberUtil.getRandomOrderId()); delivery.setDeliveryOrder("FH" + NumberUtil.getRandomOrderId());
if(!StringUtils.isEmpty(delivery.getLogisticOrder())){ if (!StringUtils.isEmpty(delivery.getLogisticOrder())) {
delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name()); delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
} }
//获取发货仓库信息 //获取发货仓库信息
Map<String, String> paramSend = new HashMap<String, String>(); Map<String, String> paramSend = new HashMap<String, String>();
paramSend.put("id",da.getWarehouseId()); paramSend.put("id", da.getWarehouseId());
String jsonSend = HttpClientUtils.post(detailUrl,paramSend,"UTF-8", "UTF-8"); String jsonSend = HttpClientUtils.post(detailUrl, paramSend, "UTF-8", "UTF-8");
JSONObject jsonObjectSend=JSONObject.parseObject(jsonSend); JSONObject jsonObjectSend = JSONObject.parseObject(jsonSend);
String data=jsonObjectSend.getString("data"); String data = jsonObjectSend.getString("data");
JSONObject jsonObjectData=JSONObject.parseObject(data); JSONObject jsonObjectData = JSONObject.parseObject(data);
delivery.setSender(jsonObjectData.getString("receivePeople")); delivery.setSender(jsonObjectData.getString("receivePeople"));
delivery.setSenderPhone(jsonObjectData.getString("receivePhone")); delivery.setSenderPhone(jsonObjectData.getString("receivePhone"));
delivery.setWarehouseId(da.getWarehouseId()); delivery.setWarehouseId(da.getWarehouseId());
delivery.setWarehouseName(jsonObjectData.getString("name")); delivery.setWarehouseName(jsonObjectData.getString("name"));
if(!ProductType.辅材.name().equals(delivery.getIsproduct())){ if (!ProductType.辅材.name().equals(delivery.getIsproduct())) {
//如果是墙盒 根据订单号去订单表里把墙盒名称 墙盒类别 厂商拿到并添加到发货表里 //如果是墙盒 根据订单号去订单表里把墙盒名称 墙盒类别 厂商拿到并添加到发货表里
Order selectOrder = orderDao.selectById(da.getInstallOrder()); Order selectOrder = orderDao.selectById(da.getInstallOrder());
if (!StringUtils.isEmpty(selectOrder)){ if (!StringUtils.isEmpty(selectOrder)) {
//物料类型 //物料类型
delivery.setMaterialCategory(da.getIsproduct()); delivery.setMaterialCategory(da.getIsproduct());
//厂商 //厂商
if (!StringUtils.isEmpty(selectOrder.getOemName())){ if (!StringUtils.isEmpty(selectOrder.getOemName())) {
delivery.setMaterialCompany(selectOrder.getOemName()); delivery.setMaterialCompany(selectOrder.getOemName());
} }
//物料编码 //物料编码
delivery.setMaterialCode(selectOrder.getItemModel()); delivery.setMaterialCode(selectOrder.getItemModel());
} }
//收货仓库的信息 //收货仓库的信息
WallboxApply wallboxApply=wallboxApplyMapper.selectWallboxApplyByOrderId(da.getInstallOrder()); WallboxApply wallboxApply = wallboxApplyMapper.selectWallboxApplyByOrderId(da.getInstallOrder());
if (!StringUtils.isEmpty(wallboxApply)){ if (Objects.nonNull(wallboxApply)) {
delivery.setReceiver(wallboxApply.getReceiver()); delivery.setReceiver(wallboxApply.getReceiver());
delivery.setReceiverPhone(wallboxApply.getReceiverPhone()); delivery.setReceiverPhone(wallboxApply.getReceiverPhone());
delivery.setArrivalWarehouseId(wallboxApply.getReceiverWarehouseId()); delivery.setArrivalWarehouseId(wallboxApply.getReceiverWarehouseId());
delivery.setArrivalWarehouse(wallboxApply.getReceiverWarehouseName()); delivery.setArrivalWarehouse(wallboxApply.getReceiverWarehouseName());
Map<String, String> paramArrival = new HashMap<String, String>(); Map<String, String> paramArrival = new HashMap<String, String>();
paramArrival.put("id",wallboxApply.getReceiverWarehouseId()); paramArrival.put("id", wallboxApply.getReceiverWarehouseId());
paramArrival.put("materialCode",selectOrder.getItemModel()); paramArrival.put("materialCode", selectOrder.getItemModel());
String jsonArrival = HttpClientUtils.post(detailUrl,paramArrival,"UTF-8", "UTF-8"); String jsonArrival = HttpClientUtils.post(detailUrl, paramArrival, "UTF-8", "UTF-8");
JSONObject jsonObjectArrival=JSONObject.parseObject(jsonArrival); JSONObject jsonObjectArrival = JSONObject.parseObject(jsonArrival);
String dataArrival=jsonObjectArrival.getString("data"); String dataArrival = jsonObjectArrival.getString("data");
if (!StringUtils.isEmpty(dataArrival)){ if (!StringUtils.isEmpty(dataArrival)) {
JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival); JSONObject jsonObjectDataArrival = JSONObject.parseObject(dataArrival);
//物料名称 //物料名称
if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){ if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))) {
delivery.setMaterialName(jsonObjectDataArrival.getString("materialsName")); delivery.setMaterialName(jsonObjectDataArrival.getString("materialsName"));
} }
if (wallboxApply.getReceiverWarehouseId().equals(da.getWarehouseId())){ if (wallboxApply.getReceiverWarehouseId().equals(da.getWarehouseId())) {
throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!"); throw new ServiceException("400", "发货仓库和到货仓库请选择不同的仓库!");
}
} }
} }
//申请团队 //申请团队
delivery.setTeam(wallboxApply.getSupplierTeam()); delivery.setTeam(wallboxApply.getSupplierTeam());
Delivery deliveryInstallOrder=deliveryMapper.selectByInstallOrder(da.getInstallOrder());
if (!StringUtils.isEmpty(deliveryInstallOrder)){
throw new ServiceException("400","订单号重复!");
} }
int result=this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",delivery.getInstallOrder());
if(result!=1){ Delivery deliveryInstallOrder = deliveryMapper.selectByInstallOrder(da.getInstallOrder());
throw new ServiceException("400","更新订单发货状态失败！订单号："+delivery.getInstallOrder()); if (!StringUtils.isEmpty(deliveryInstallOrder)) {
throw new ServiceException("400", "订单号重复!");
}
int result = this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1", delivery.getInstallOrder());
if (result != 1) {
throw new ServiceException("400", "更新订单发货状态失败！订单号：" + delivery.getInstallOrder());
} }
}else{ } else {
Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder()); Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder());
List<String> list=new ArrayList<>(); List<String> list = new ArrayList<>();
Integer quantity=0; Integer quantity = 0;
for (DeliveryAddVo deliveryAddVo:deliveryAddVoList){ for (DeliveryAddVo deliveryAddVo : deliveryAddVoList) {
quantity=quantity+deliveryAddVo.getQuantity(); quantity = quantity + deliveryAddVo.getQuantity();
if (list.contains(deliveryAddVo.getLogisticOrder())){ if (list.contains(deliveryAddVo.getLogisticOrder())) {
throw new ServiceException("400","相同申请单号下的多个物流单号不能重复!"); throw new ServiceException("400", "相同申请单号下的多个物流单号不能重复!");
}else { } else {
list.add(deliveryAddVo.getLogisticOrder()); list.add(deliveryAddVo.getLogisticOrder());
} }
} }
if (!StringUtils.isEmpty(tauxiliarymaterials) && !StringUtils.isEmpty(tauxiliarymaterials.getApprovedQuantity())){ if (!StringUtils.isEmpty(tauxiliarymaterials) && !StringUtils.isEmpty(tauxiliarymaterials.getApprovedQuantity())) {
if (quantity.compareTo(Integer.parseInt(tauxiliarymaterials.getApprovedQuantity())) > 0){ if (quantity.compareTo(Integer.parseInt(tauxiliarymaterials.getApprovedQuantity())) > 0) {
throw new ServiceException("400","发货数量的总和不能大于批准数量!"); throw new ServiceException("400", "发货数量的总和不能大于批准数量!");
} }
} }
if (tauxiliarymaterials.getWarehouseId().equals(da.getWarehouseId())){ if (tauxiliarymaterials.getWarehouseId().equals(da.getWarehouseId())) {
throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!"); throw new ServiceException("400", "发货仓库和到货仓库请选择不同的仓库!");
} }
//收货仓库的信息 //收货仓库的信息
if (!StringUtils.isEmpty(tauxiliarymaterials)){ if (!StringUtils.isEmpty(tauxiliarymaterials)) {
delivery.setReceiver(tauxiliarymaterials.getRecipents()); delivery.setReceiver(tauxiliarymaterials.getRecipents());
delivery.setReceiverPhone(tauxiliarymaterials.getReceivePhone()); delivery.setReceiverPhone(tauxiliarymaterials.getReceivePhone());
delivery.setReceiveAddress(tauxiliarymaterials.getReceiveAddress()); delivery.setReceiveAddress(tauxiliarymaterials.getReceiveAddress());
...@@ -183,32 +182,35 @@ public class DeliveryController { ...@@ -183,32 +182,35 @@ public class DeliveryController {
delivery.setMaterialName(tauxiliarymaterials.getMaterialName()); delivery.setMaterialName(tauxiliarymaterials.getMaterialName());
delivery.setMaterialCategory(da.getIsproduct()); delivery.setMaterialCategory(da.getIsproduct());
int result=this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.已发货.name(),delivery.getInstallOrder()); int result = this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.已发货.name(), delivery.getInstallOrder());
if(result!=1){ if (result != 1) {
throw new ServiceException("400","更新辅材订单发货状态失败！订单号："+delivery.getInstallOrder()); throw new ServiceException("400", "更新辅材订单发货状态失败！订单号：" + delivery.getInstallOrder());
} }
} }
this.commonUpdateService.UpdateColumns(delivery,true); this.commonUpdateService.UpdateColumns(delivery, true);
return this.deliveryMapper.insertSelective(delivery); return this.deliveryMapper.insertSelective(delivery);
}).reduce(0,Integer::sum)); }).reduce(0, Integer::sum));
} }
@PostMapping("/query") @PostMapping("/query")
@ApiOperation(value = "发货列表查询") @ApiOperation(value = "发货列表查询")
public BaseResponse<List<Delivery>> queryDelivery(Delivery delivery){ public BaseResponse<List<Delivery>> queryDelivery(Delivery delivery) {
if (!StringUtils.isEmpty(delivery.getLogisticStatus())){ if (!StringUtils.isEmpty(delivery.getLogisticStatus())) {
List<String> list= Arrays.asList(delivery.getLogisticStatus()); List<String> list = Arrays.asList(delivery.getLogisticStatus());
delivery.setLogisticStatusList(list); delivery.setLogisticStatusList(list);
} }
return new BaseResponse(this.deliveryMapper.selectDeliveryList(delivery)); return new BaseResponse(this.deliveryMapper.selectDeliveryList(delivery));
} }
@GetMapping("/detail") @GetMapping("/detail")
@ApiOperation(value = "发货详情") @ApiOperation(value = "发货详情")
public BaseResponse<Delivery> getdetail(@RequestParam int id){ public BaseResponse<Delivery> getdetail(@RequestParam int id) {
return new BaseResponse(this.deliveryMapper.selectByPrimaryKey(id)); return new BaseResponse(this.deliveryMapper.selectByPrimaryKey(id));
} }
@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.deliveryMapper.deleteByPrimaryKey(id)); return new BaseResponse(this.deliveryMapper.deleteByPrimaryKey(id));
} }
...@@ -216,23 +218,23 @@ public class DeliveryController { ...@@ -216,23 +218,23 @@ public class DeliveryController {
@ApiOperation("更新发货单信息") @ApiOperation("更新发货单信息")
@ParamsValidate @ParamsValidate
@Transactional @Transactional
public BaseResponse<DeliveryUpdateDTO> update(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){ public BaseResponse<DeliveryUpdateDTO> update(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult) {
Delivery before=this.deliveryMapper.selectByPrimaryKey(deliveryUpdateDTO.getId()); Delivery before = this.deliveryMapper.selectByPrimaryKey(deliveryUpdateDTO.getId());
if(StringUtils.hasLength(before.getInstallOrder())&&!before.getInstallOrder().equals(deliveryUpdateDTO.getInstallOrder())){ if (StringUtils.hasLength(before.getInstallOrder()) && !before.getInstallOrder().equals(deliveryUpdateDTO.getInstallOrder())) {
if(!ProductType.辅材.name().equals(deliveryUpdateDTO)){ if (!ProductType.辅材.name().equals(deliveryUpdateDTO)) {
this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("0",before.getInstallOrder()); this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("0", before.getInstallOrder());
this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",deliveryUpdateDTO.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(),deliveryUpdateDTO.getInstallOrder()); this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.已发货.name(), deliveryUpdateDTO.getInstallOrder());
} }
} }
if(StringUtils.isEmpty(deliveryUpdateDTO.getLogisticOrder())){ if (StringUtils.isEmpty(deliveryUpdateDTO.getLogisticOrder())) {
deliveryUpdateDTO.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name()); deliveryUpdateDTO.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name());
}else{ } else {
deliveryUpdateDTO.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name()); deliveryUpdateDTO.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
} }
this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false); this.commonUpdateService.UpdateColumns(deliveryUpdateDTO, false);
return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO)); return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
} }
...@@ -250,7 +252,7 @@ public class DeliveryController { ...@@ -250,7 +252,7 @@ public class DeliveryController {
@GetMapping("/supplierIdByOrderId") @GetMapping("/supplierIdByOrderId")
@ApiOperation(value = "根据安装单号获取服务商") @ApiOperation(value = "根据安装单号获取服务商")
public BaseResponse<WallboxApply> supplierIdByOrderId(@RequestParam String orderId){ public BaseResponse<WallboxApply> supplierIdByOrderId(@RequestParam String orderId) {
return new BaseResponse(this.wallboxApplyMapper.selectWallboxApplyByOrderId(orderId)); return new BaseResponse(this.wallboxApplyMapper.selectWallboxApplyByOrderId(orderId));
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论