Skip to content

W
wios
提交 5fda377a 作者: luyincheng
操作

新增收货仓库id、名称、收货人字段 

发货通过物料编码更新墙盒发货状态改为通过安装单号更新
新增、修改发货同步更新墙盒和辅材发货状态
新增、修改发货时logistic_order不为空设置logistic_status已发货
isproduct字段（字符类型），新增时候可以自定义填类型，查询时候通过该参数查询
增加辅材审批导入模板、导入解析service
辅材批量审批增加可通过申请单号审批
父级 ff4ca597
正在显示 包含 252 行增加 和 33 行删除
src/main/java/com/starcharge/wios/Import/impl/AuxiliarymaterialsCheckImport.java 0 → 100644
package com.starcharge.wios.Import.impl;
import com.starcharge.wios.Import.Import;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.List;
/**
* @projectName:wios
* @packageName:com.starcharge.wios.Import.impl
* @Description:TODO
* @Author:luyincheng
* @CreateDate: 2023/11/1610:13
*/
@Service
public class AuxiliarymaterialsCheckImport implements Import {
@Override
public List<?> handle(List<Object> list) {
for(int i=1;i<list.size();i++){
List<String> rowdata = (List<String>)list.get(i);
if(rowdata.size()<=1|| StringUtils.isEmpty(rowdata.get(1))){
rowdata.add("error:申请单号不能为空");
continue;
}
}
return list;
}
}
src/main/java/com/starcharge/wios/controller/DeliveryController.java
package com.starcharge.wios.controller; package com.starcharge.wios.controller;
import com.ihidea.component.api.v2.BaseResponse; import com.ihidea.component.api.v2.BaseResponse;
import com.ihidea.core.support.exception.ServiceException;
import com.starcharge.wios.auth.service.TokenService; import com.starcharge.wios.auth.service.TokenService;
import com.starcharge.wios.convert.DeliveryConvert; import com.starcharge.wios.convert.DeliveryConvert;
import com.starcharge.wios.dao.entity.Delivery; import com.starcharge.wios.dao.entity.Delivery;
import com.starcharge.wios.dao.entity.WallboxApply; 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.WallboxApplyMapper; import com.starcharge.wios.dao.mappers.WallboxApplyMapper;
import com.starcharge.wios.enums2.ProductType;
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;
import com.starcharge.wios.utils.ExcelUtils; import com.starcharge.wios.utils.ExcelUtils;
import com.starcharge.wios.utils.NumberUtil;
import com.starcharge.wios.validation.CreateEntityGroup; import com.starcharge.wios.validation.CreateEntityGroup;
import com.starcharge.wios.validation.ParamsValidate; import com.starcharge.wios.validation.ParamsValidate;
import com.starcharge.wios.validation.UpdateEntityGroup; import com.starcharge.wios.validation.UpdateEntityGroup;
...@@ -20,6 +25,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -20,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -47,7 +53,7 @@ public class DeliveryController { ...@@ -47,7 +53,7 @@ public class DeliveryController {
@Autowired @Autowired
private CommonUpdateService commonUpdateService; private CommonUpdateService commonUpdateService;
@Autowired @Autowired
private SnowFlakeService snowFlakeService; private TauxiliarymaterialsMapper tauxiliarymaterialsMapper;
@Autowired @Autowired
private WallboxApplyMapper wallboxApplyMapper; private WallboxApplyMapper wallboxApplyMapper;
@PostMapping("/add") @PostMapping("/add")
...@@ -55,13 +61,26 @@ public class DeliveryController { ...@@ -55,13 +61,26 @@ public class DeliveryController {
@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->{
Delivery delivery= DeliveryConvert.INSTANCE.convertAddVo(da); Delivery delivery= DeliveryConvert.INSTANCE.convertAddVo(da);
delivery.setDeliveryOrder(orderid); delivery.setDeliveryOrder("FH"+NumberUtil.getRandomOrderId());
if(!StringUtils.isEmpty(delivery.getLogisticOrder())){
delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
}
if(!ProductType.辅材.name().equals(delivery.getIsproduct())){
int result=this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",delivery.getInstallOrder());
if(result!=1){
throw new ServiceException("400","更新订单发货状态失败！订单号："+delivery.getInstallOrder());
}
}else{
int result=this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.已发货.name(),delivery.getInstallOrder());
if(result!=1){
throw new ServiceException("400","更新辅材订单发货状态失败！订单号："+delivery.getInstallOrder());
}
}
this.commonUpdateService.UpdateColumns(delivery,true); this.commonUpdateService.UpdateColumns(delivery,true);
this.wallboxApplyMapper.updateWallBoxTrackingStatusByMC("1",delivery.getMaterialCode());
return this.deliveryMapper.insertSelective(delivery); return this.deliveryMapper.insertSelective(delivery);
}).reduce(0,Integer::sum)); }).reduce(0,Integer::sum));
} }
...@@ -83,7 +102,23 @@ public class DeliveryController { ...@@ -83,7 +102,23 @@ public class DeliveryController {
@PostMapping("/update") @PostMapping("/update")
@ApiOperation("更新发货单信息") @ApiOperation("更新发货单信息")
@ParamsValidate @ParamsValidate
@Transactional
public BaseResponse<Delivery> update(@RequestBody @Validated(UpdateEntityGroup.class) Delivery delivery, BindingResult bindingResult){ public BaseResponse<Delivery> update(@RequestBody @Validated(UpdateEntityGroup.class) Delivery delivery, BindingResult bindingResult){
Delivery before=this.deliveryMapper.selectByPrimaryKey(delivery.getId());
if(StringUtils.hasLength(before.getInstallOrder())&&!before.getInstallOrder().equals(delivery.getInstallOrder())){
if(!ProductType.辅材.name().equals(delivery)){
this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("0",before.getInstallOrder());
this.wallboxApplyMapper.updateWallBoxTrackingStatusByOrderId("1",delivery.getInstallOrder());
}else{
this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.未发货.name(),before.getInstallOrder());
this.tauxiliarymaterialsMapper.updateTauxiliarymaterialsLogisticStatusByApplyOrder(TauxiliarymaterialStatusEnum.已发货.name(),delivery.getInstallOrder());
}
}
if(StringUtils.isEmpty(delivery.getLogisticOrder())){
delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.未发货.name());
}else{
delivery.setLogisticStatus(TauxiliarymaterialStatusEnum.已发货.name());
}
this.commonUpdateService.UpdateColumns(delivery,false); this.commonUpdateService.UpdateColumns(delivery,false);
return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(delivery)); return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(delivery));
} }
......
src/main/java/com/starcharge/wios/controller/TauxiliarymaterialsController.java
...@@ -148,7 +148,11 @@ public class TauxiliarymaterialsController { ...@@ -148,7 +148,11 @@ public class TauxiliarymaterialsController {
SessionInfo sessionInfo = tokenService.getUser(); SessionInfo sessionInfo = tokenService.getUser();
tauxiliarymaterialsCheckDto.getTauxiliarymaterialsCheckVoList().stream() tauxiliarymaterialsCheckDto.getTauxiliarymaterialsCheckVoList().stream()
.filter(dto->{ .filter(dto->{
var exist=this.tauxiliarymaterialsMapper.selectByPrimaryKey(dto.getId()); Tauxiliarymaterials exist=null;
if(dto.getId()>0){
exist=this.tauxiliarymaterialsMapper.selectByPrimaryKey(dto.getId());
}else if(StringUtils.hasLength(dto.getApplyOrder())){
exist=this.tauxiliarymaterialsMapper.selectByApplyOrder(dto.getApplyOrder()); }
if(exist==null){ if(exist==null){
return false; return false;
}else{ }else{
......
src/main/java/com/starcharge/wios/dao/entity/Delivery.java
...@@ -132,8 +132,7 @@ public class Delivery extends PageVo implements Serializable { ...@@ -132,8 +132,7 @@ public class Delivery extends PageVo implements Serializable {
*/ */
@ApiModelProperty(value = "是否产品或辅料 1 是 0 否") @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
@NotNull(groups = CreateEntityGroup.class) @NotNull(groups = CreateEntityGroup.class)
@Range(min=0,max = 1,message = "是否产品或辅料只可填0或1",groups = UpdateEntityGroup.class) private String isproduct;
private Integer isproduct;
/** /**
* 创建人 * 创建人
* *
...@@ -165,6 +164,29 @@ public class Delivery extends PageVo implements Serializable { ...@@ -165,6 +164,29 @@ public class Delivery extends PageVo implements Serializable {
*/ */
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private LocalDateTime updatedTime; private LocalDateTime updatedTime;
/**
* 到货仓库
*
* @mbg.generated
*/
@ApiModelProperty(value = "到货仓库")
private String arrivalWarehouse;
/**
* 到货仓库id
*
* @mbg.generated
*/
@ApiModelProperty(value = "到货仓库id")
private Integer arrivalWarehouseId;
/**
* 收货人
*
* @mbg.generated
*/
@ApiModelProperty(value = "收货人")
private String receiver;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
src/main/java/com/starcharge/wios/dao/mappers/DeliveryMapper.xml
...@@ -15,11 +15,14 @@ ...@@ -15,11 +15,14 @@
<result column="logistic_company" jdbcType="VARCHAR" property="logisticCompany" /> <result column="logistic_company" jdbcType="VARCHAR" property="logisticCompany" />
<result column="logistic_status" jdbcType="VARCHAR" property="logisticStatus" /> <result column="logistic_status" jdbcType="VARCHAR" property="logisticStatus" />
<result column="team" jdbcType="VARCHAR" property="team" /> <result column="team" jdbcType="VARCHAR" property="team" />
<result column="isproduct" jdbcType="INTEGER" property="isproduct" /> <result column="isproduct" jdbcType="VARCHAR" property="isproduct" />
<result column="CREATED_BY" jdbcType="VARCHAR" property="createdBy" /> <result column="CREATED_BY" jdbcType="VARCHAR" property="createdBy" />
<result column="CREATED_TIME" jdbcType="TIMESTAMP" property="createdTime" /> <result column="CREATED_TIME" jdbcType="TIMESTAMP" property="createdTime" />
<result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" /> <result column="UPDATED_BY" jdbcType="VARCHAR" property="updatedBy" />
<result column="UPDATED_TIME" jdbcType="TIMESTAMP" property="updatedTime" /> <result column="UPDATED_TIME" jdbcType="TIMESTAMP" property="updatedTime" />
<result column="arrival_warehouse" jdbcType="VARCHAR" property="arrivalWarehouse" />
<result column="arrival_warehouse_id" jdbcType="INTEGER" property="arrivalWarehouseId" />
<result column="receiver" jdbcType="VARCHAR" property="receiver" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
...@@ -79,6 +82,12 @@ ...@@ -79,6 +82,12 @@
</foreach> </foreach>
</where> </where>
</sql> </sql>
<sql id="Base_Column_List">
id, delivery_order, install_order, product_batch, quantity, material_category, material_code,
material_name, material_company, logistic_order, logistic_company, logistic_status,
team, isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, arrival_warehouse,
arrival_warehouse_id, receiver
</sql>
<select id="selectDeliveryList" parameterType="com.starcharge.wios.dao.entity.Delivery" resultMap="BaseResultMap"> <select id="selectDeliveryList" parameterType="com.starcharge.wios.dao.entity.Delivery" resultMap="BaseResultMap">
select select
...@@ -104,12 +113,12 @@ ...@@ -104,12 +113,12 @@
<if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if> <if test="updatedTime != null "> and UPDATED_TIME = #{updatedTime}</if>
</where> </where>
</select> </select>
<select id="selectByLogisticOrder" parameterType="string" resultMap="BaseResultMap">
<sql id="Base_Column_List"> select
id, delivery_order, install_order, product_batch, quantity, material_category, material_code, <include refid="Base_Column_List" />
material_name, material_company, logistic_order, logistic_company, logistic_status, from t_delivery
team, isproduct, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME where logistic_order = #{logisticOrder,jdbcType=VARCHAR}
</sql> </select>
<select id="selectByExample" parameterType="com.starcharge.wios.dao.entity.DeliveryCriteria" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.starcharge.wios.dao.entity.DeliveryCriteria" resultMap="BaseResultMap">
select select
<if test="distinct"> <if test="distinct">
...@@ -130,12 +139,6 @@ ...@@ -130,12 +139,6 @@
from t_delivery from t_delivery
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByLogisticOrder" parameterType="string" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_delivery
where logistic_order = #{logisticOrder,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from t_delivery delete from t_delivery
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
...@@ -155,13 +158,15 @@ ...@@ -155,13 +158,15 @@
material_name, material_company, logistic_order, material_name, material_company, logistic_order,
logistic_company, logistic_status, team, logistic_company, logistic_status, team,
isproduct, CREATED_BY, CREATED_TIME, isproduct, CREATED_BY, CREATED_TIME,
UPDATED_BY, UPDATED_TIME) UPDATED_BY, UPDATED_TIME, arrival_warehouse,
arrival_warehouse_id, receiver)
values (#{deliveryOrder,jdbcType=VARCHAR}, #{installOrder,jdbcType=VARCHAR}, #{productBatch,jdbcType=VARCHAR}, values (#{deliveryOrder,jdbcType=VARCHAR}, #{installOrder,jdbcType=VARCHAR}, #{productBatch,jdbcType=VARCHAR},
#{quantity,jdbcType=INTEGER}, #{materialCategory,jdbcType=VARCHAR}, #{materialCode,jdbcType=VARCHAR}, #{quantity,jdbcType=INTEGER}, #{materialCategory,jdbcType=VARCHAR}, #{materialCode,jdbcType=VARCHAR},
#{materialName,jdbcType=VARCHAR}, #{materialCompany,jdbcType=VARCHAR}, #{logisticOrder,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{materialCompany,jdbcType=VARCHAR}, #{logisticOrder,jdbcType=VARCHAR},
#{logisticCompany,jdbcType=VARCHAR}, #{logisticStatus,jdbcType=VARCHAR}, #{team,jdbcType=VARCHAR}, #{logisticCompany,jdbcType=VARCHAR}, #{logisticStatus,jdbcType=VARCHAR}, #{team,jdbcType=VARCHAR},
#{isproduct,jdbcType=INTEGER}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP}, #{isproduct,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR}, #{createdTime,jdbcType=TIMESTAMP},
#{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP}) #{updatedBy,jdbcType=VARCHAR}, #{updatedTime,jdbcType=TIMESTAMP}, #{arrivalWarehouse,jdbcType=VARCHAR},
#{arrivalWarehouseId,jdbcType=INTEGER}, #{receiver,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.starcharge.wios.dao.entity.Delivery"> <insert id="insertSelective" parameterType="com.starcharge.wios.dao.entity.Delivery">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
...@@ -220,6 +225,15 @@ ...@@ -220,6 +225,15 @@
<if test="updatedTime != null"> <if test="updatedTime != null">
UPDATED_TIME, UPDATED_TIME,
</if> </if>
<if test="arrivalWarehouse != null">
arrival_warehouse,
</if>
<if test="arrivalWarehouseId != null">
arrival_warehouse_id,
</if>
<if test="receiver != null">
receiver,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deliveryOrder != null"> <if test="deliveryOrder != null">
...@@ -259,7 +273,7 @@ ...@@ -259,7 +273,7 @@
#{team,jdbcType=VARCHAR}, #{team,jdbcType=VARCHAR},
</if> </if>
<if test="isproduct != null"> <if test="isproduct != null">
#{isproduct,jdbcType=INTEGER}, #{isproduct,jdbcType=VARCHAR},
</if> </if>
<if test="createdBy != null"> <if test="createdBy != null">
#{createdBy,jdbcType=VARCHAR}, #{createdBy,jdbcType=VARCHAR},
...@@ -273,6 +287,15 @@ ...@@ -273,6 +287,15 @@
<if test="updatedTime != null"> <if test="updatedTime != null">
#{updatedTime,jdbcType=TIMESTAMP}, #{updatedTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="arrivalWarehouse != null">
#{arrivalWarehouse,jdbcType=VARCHAR},
</if>
<if test="arrivalWarehouseId != null">
#{arrivalWarehouseId,jdbcType=INTEGER},
</if>
<if test="receiver != null">
#{receiver,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.starcharge.wios.dao.entity.DeliveryCriteria" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.starcharge.wios.dao.entity.DeliveryCriteria" resultType="java.lang.Long">
...@@ -324,7 +347,7 @@ ...@@ -324,7 +347,7 @@
team = #{record.team,jdbcType=VARCHAR}, team = #{record.team,jdbcType=VARCHAR},
</if> </if>
<if test="record.isproduct != null"> <if test="record.isproduct != null">
isproduct = #{record.isproduct,jdbcType=INTEGER}, isproduct = #{record.isproduct,jdbcType=VARCHAR},
</if> </if>
<if test="record.createdBy != null"> <if test="record.createdBy != null">
CREATED_BY = #{record.createdBy,jdbcType=VARCHAR}, CREATED_BY = #{record.createdBy,jdbcType=VARCHAR},
...@@ -338,6 +361,15 @@ ...@@ -338,6 +361,15 @@
<if test="record.updatedTime != null"> <if test="record.updatedTime != null">
UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP}, UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.arrivalWarehouse != null">
arrival_warehouse = #{record.arrivalWarehouse,jdbcType=VARCHAR},
</if>
<if test="record.arrivalWarehouseId != null">
arrival_warehouse_id = #{record.arrivalWarehouseId,jdbcType=INTEGER},
</if>
<if test="record.receiver != null">
receiver = #{record.receiver,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -358,11 +390,14 @@ ...@@ -358,11 +390,14 @@
logistic_company = #{record.logisticCompany,jdbcType=VARCHAR}, logistic_company = #{record.logisticCompany,jdbcType=VARCHAR},
logistic_status = #{record.logisticStatus,jdbcType=VARCHAR}, logistic_status = #{record.logisticStatus,jdbcType=VARCHAR},
team = #{record.team,jdbcType=VARCHAR}, team = #{record.team,jdbcType=VARCHAR},
isproduct = #{record.isproduct,jdbcType=INTEGER}, isproduct = #{record.isproduct,jdbcType=VARCHAR},
CREATED_BY = #{record.createdBy,jdbcType=VARCHAR}, CREATED_BY = #{record.createdBy,jdbcType=VARCHAR},
CREATED_TIME = #{record.createdTime,jdbcType=TIMESTAMP}, CREATED_TIME = #{record.createdTime,jdbcType=TIMESTAMP},
UPDATED_BY = #{record.updatedBy,jdbcType=VARCHAR}, UPDATED_BY = #{record.updatedBy,jdbcType=VARCHAR},
UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP} UPDATED_TIME = #{record.updatedTime,jdbcType=TIMESTAMP},
arrival_warehouse = #{record.arrivalWarehouse,jdbcType=VARCHAR},
arrival_warehouse_id = #{record.arrivalWarehouseId,jdbcType=INTEGER},
receiver = #{record.receiver,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -407,7 +442,7 @@ ...@@ -407,7 +442,7 @@
team = #{team,jdbcType=VARCHAR}, team = #{team,jdbcType=VARCHAR},
</if> </if>
<if test="isproduct != null"> <if test="isproduct != null">
isproduct = #{isproduct,jdbcType=INTEGER}, isproduct = #{isproduct,jdbcType=VARCHAR},
</if> </if>
<if test="createdBy != null"> <if test="createdBy != null">
CREATED_BY = #{createdBy,jdbcType=VARCHAR}, CREATED_BY = #{createdBy,jdbcType=VARCHAR},
...@@ -421,6 +456,15 @@ ...@@ -421,6 +456,15 @@
<if test="updatedTime != null"> <if test="updatedTime != null">
UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP}, UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="arrivalWarehouse != null">
arrival_warehouse = #{arrivalWarehouse,jdbcType=VARCHAR},
</if>
<if test="arrivalWarehouseId != null">
arrival_warehouse_id = #{arrivalWarehouseId,jdbcType=INTEGER},
</if>
<if test="receiver != null">
receiver = #{receiver,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -438,11 +482,14 @@ ...@@ -438,11 +482,14 @@
logistic_company = #{logisticCompany,jdbcType=VARCHAR}, logistic_company = #{logisticCompany,jdbcType=VARCHAR},
logistic_status = #{logisticStatus,jdbcType=VARCHAR}, logistic_status = #{logisticStatus,jdbcType=VARCHAR},
team = #{team,jdbcType=VARCHAR}, team = #{team,jdbcType=VARCHAR},
isproduct = #{isproduct,jdbcType=INTEGER}, isproduct = #{isproduct,jdbcType=VARCHAR},
CREATED_BY = #{createdBy,jdbcType=VARCHAR}, CREATED_BY = #{createdBy,jdbcType=VARCHAR},
CREATED_TIME = #{createdTime,jdbcType=TIMESTAMP}, CREATED_TIME = #{createdTime,jdbcType=TIMESTAMP},
UPDATED_BY = #{updatedBy,jdbcType=VARCHAR}, UPDATED_BY = #{updatedBy,jdbcType=VARCHAR},
UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP} UPDATED_TIME = #{updatedTime,jdbcType=TIMESTAMP},
arrival_warehouse = #{arrivalWarehouse,jdbcType=VARCHAR},
arrival_warehouse_id = #{arrivalWarehouseId,jdbcType=INTEGER},
receiver = #{receiver,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
src/main/java/com/starcharge/wios/dao/mappers/TauxiliarymaterialsMapper.java
...@@ -4,6 +4,8 @@ import com.starcharge.wios.dao.entity.Tauxiliarymaterials; ...@@ -4,6 +4,8 @@ import com.starcharge.wios.dao.entity.Tauxiliarymaterials;
import com.starcharge.wios.dao.entity.TauxiliarymaterialsAdd; import com.starcharge.wios.dao.entity.TauxiliarymaterialsAdd;
import com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria; import com.starcharge.wios.dao.entity.TauxiliarymaterialsCriteria;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
...@@ -41,4 +43,11 @@ public interface TauxiliarymaterialsMapper { ...@@ -41,4 +43,11 @@ public interface TauxiliarymaterialsMapper {
Tauxiliarymaterials getRecentTAuxiliaryMaterials(@Param("materialCode")String materialCode); Tauxiliarymaterials getRecentTAuxiliaryMaterials(@Param("materialCode")String materialCode);
int updateLogisticOrder(@Param("id")int id,@Param("logisticOrder")String logisticOrder); int updateLogisticOrder(@Param("id")int id,@Param("logisticOrder")String logisticOrder);
@Update("update t_auxiliary_materials set logistic_status=#{logisticStatus} where apply_order=#{applyOrder}")
public int updateTauxiliarymaterialsLogisticStatusByApplyOrder(@Param("logisticStatus")String logisticStatus,@Param("applyOrder")String applyOrder);
@Select("select * from t_auxiliary_materials where apply_order=#{applyOrder} limit 1")
Tauxiliarymaterials selectByApplyOrder(@Param("applyOrder")String applyOrder);
} }
\ No newline at end of file
src/main/java/com/starcharge/wios/dao/mappers/WallboxApplyMapper.java
...@@ -90,4 +90,7 @@ public interface WallboxApplyMapper { ...@@ -90,4 +90,7 @@ public interface WallboxApplyMapper {
*/ */
@Update("update t_wallbox_apply set tracking_status=#{trackingStatus} where wallbox_item_id=#{wallboxItemId}") @Update("update t_wallbox_apply set tracking_status=#{trackingStatus} where wallbox_item_id=#{wallboxItemId}")
public int updateWallBoxTrackingStatusByMC(@Param("trackingStatus")String trackingStatus,@Param("wallboxItemId")String wallboxItemId); public int updateWallBoxTrackingStatusByMC(@Param("trackingStatus")String trackingStatus,@Param("wallboxItemId")String wallboxItemId);
@Update("update t_wallbox_apply set tracking_status=#{trackingStatus} where order_id=#{orderId}")
public int updateWallBoxTrackingStatusByOrderId(@Param("trackingStatus")String trackingStatus,@Param("orderId")String orderId);
} }
src/main/java/com/starcharge/wios/dto/TauxiliarymaterialsCheckDto.java
...@@ -41,6 +41,13 @@ public class TauxiliarymaterialsCheckDto { ...@@ -41,6 +41,13 @@ public class TauxiliarymaterialsCheckDto {
@ApiModelProperty(required = true,value = "id") @ApiModelProperty(required = true,value = "id")
private Integer id; private Integer id;
/** /**
* 申请单号
*
* @mbg.generated
*/
@ApiModelProperty(value = "申请单号")
private String applyOrder;
/**
* 批准数量 * 批准数量
* *
* @mbg.generated * @mbg.generated
......
src/main/java/com/starcharge/wios/enums2/ProductType.java 0 → 100644
package com.starcharge.wios.enums2;
/**
* @projectName:wios
* @packageName:com.starcharge.wios.enums2
* @Description:TODO
* @Author:luyincheng
* @CreateDate: 2023/11/169:33
*/
public enum ProductType {
辅材,品牌墙盒,三方墙盒
}
src/main/java/com/starcharge/wios/vo/DeliveryAddVo.java
...@@ -140,6 +140,30 @@ public class DeliveryAddVo { ...@@ -140,6 +140,30 @@ public class DeliveryAddVo {
*/ */
@ApiModelProperty(value = "是否产品或辅料 1 是 0 否") @ApiModelProperty(value = "是否产品或辅料 1 是 0 否")
@NotNull(groups = CreateEntityGroup.class) @NotNull(groups = CreateEntityGroup.class)
@Range(min=0,max = 1,message = "是否产品或辅料只可填0或1",groups =CreateEntityGroup.class ) private String isproduct;
private Integer isproduct;
/**
* 到货仓库
*
* @mbg.generated
*/
@ApiModelProperty(value = "到货仓库")
private String arrivalWarehouse;
/**
* 到货仓库id
*
* @mbg.generated
*/
@ApiModelProperty(value = "到货仓库id")
private Integer arrivalWarehouseId;
/**
* 收货人
*
* @mbg.generated
*/
@ApiModelProperty(value = "收货人")
private String receiver;
} }
src/main/java/com/starcharge/wios/vo/DeliveryExcelVo.java
package com.starcharge.wios.vo; package com.starcharge.wios.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -122,7 +123,7 @@ public class DeliveryExcelVo { ...@@ -122,7 +123,7 @@ public class DeliveryExcelVo {
* @mbg.generated * @mbg.generated
*/ */
@ExcelProperty(value = "是否产品或辅料") @ExcelProperty(value = "是否产品或辅料")
private Integer isproduct; private String isproduct;
/** /**
* 创建人 * 创建人
* *
...@@ -154,4 +155,28 @@ public class DeliveryExcelVo { ...@@ -154,4 +155,28 @@ public class DeliveryExcelVo {
*/ */
@ExcelProperty(value = "更新时间") @ExcelProperty(value = "更新时间")
private LocalDateTime updatedTime; private LocalDateTime updatedTime;
/**
* 到货仓库
*
* @mbg.generated
*/
@ExcelProperty(value = "到货仓库")
private String arrivalWarehouse;
/**
* 到货仓库id
*
* @mbg.generated
*/
@ExcelProperty(value = "到货仓库id")
private Integer arrivalWarehouseId;
/**
* 收货人
*
* @mbg.generated
*/
@ExcelProperty(value = "收货人")
private String receiver;
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论