解决严重问题,修改业务单据类型会把扫码单据编码替换成业务单据类型编码

fengcang
anthonyywj2 3 years ago
parent ad1abc75bb
commit 36d7cd6ee3

@ -209,7 +209,7 @@ public class BussinessLocalTypeController {
}
if (bussinessTypeEntity != null) {
bussinessTypeEntity.setAction("ST" + CustomUtil.getId());
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getAction());
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction());
if (bussinessLocalTypeEntity != null) {
ResultVOUtils.error(999, "业务类型已存在!");
} else {

@ -228,6 +228,9 @@ public class WareHouseController {
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/findErrorByOrderId")
public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) {
return ResultVOUtils.error(500, "单据号不能为空!");
}
List<WarehouseEntity> warehousetempList = codesTempService.findByOrderId(warehouseQueryRequest);
PageInfo<WarehouseEntity> pageInfo;
pageInfo = new PageInfo<>(warehousetempList);

@ -1,6 +1,7 @@
package com.glxp.api.admin.req;
import lombok.Data;
import reactor.util.annotation.NonNull;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;

@ -6,6 +6,7 @@ import lombok.Data;
@Data
public class WarehouseQueryRequest extends ListPageRequest {
private String corpOrderId;
private String code;
private String udi;

@ -1,6 +1,7 @@
package com.glxp.api.admin.service.basic.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
@ -122,6 +123,9 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
@Override
public BussinessLocalTypeEntity findByAction(String action) {
if(StrUtil.isEmpty(action)){
return null;
}
BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
bussinessLocalTypeFilterRequest.setAction(action);
List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterAllList(bussinessLocalTypeFilterRequest);

@ -21,7 +21,7 @@
AND spUse =#{spUse}
</if>
</where>
order by updateTime desc
</select>
@ -95,6 +95,7 @@
</if>
</where>
group by basic_bussiness_type.action
</select>
<select id="filterJoinOrigin" parameterType="com.glxp.api.admin.req.basic.BusOriginJoinFilterRequest"

@ -44,7 +44,8 @@
AND basic_bustype_local.spUse =#{spUse}
</if>
</where>
GROUP BY basic_bussiness_type.id
GROUP BY basic_bussiness_type.
order by updateTime desc
</select>

Loading…
Cancel
Save