Merge remote-tracking branch 'origin/master'

master
anthonywj 2 years ago
commit 185a73d223

@ -70,11 +70,12 @@ public class ConstantStatus {
/**
* 2.13
* 2.13,4:
*/
public static final Integer ORDER_TYPE_BIZ = 1;
public static final Integer ORDER_TYPE_SCAN = 2;
public static final Integer ORDER_TYPE_NORMAL = 3;
public static final Integer ORDER_TYPE_WAIT = 4;
/**
*

@ -62,7 +62,7 @@ public class DeptController {
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAll")
public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setPid(0L);
filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities);
@ -72,7 +72,7 @@ public class DeptController {
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterNext")
public BaseResponse filterNext(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setPid(0L);
filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities = deptService.filterGroupInvWarehouse(filterInvWarehouseRequest);
@ -84,7 +84,7 @@ public class DeptController {
@GetMapping("spms/inv/warehouse/filterByUser")
public BaseResponse filterByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setPid(0L);
filterInvWarehouseRequest.setStatus(1);
filterInvWarehouseRequest.setUserId(authAdmin.getId());
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
@ -95,7 +95,7 @@ public class DeptController {
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllLocInv")
public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setPid(0L);
filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv");
@ -124,12 +124,12 @@ public class DeptController {
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterUplLocInv")
public BaseResponse filterUplLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setPid(0L);
filterInvWarehouseRequest.setStatus(1);
List<DeptEntity> invWarehouseEntities;
AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setUserId(authAdmin.getId());
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setPid(0L);
List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
Map<String, DeptEntity> invWarehouseEntityMap = new HashMap<>();
if (mInvWarehouseEntities.size() > 0) {
@ -155,7 +155,7 @@ public class DeptController {
List<DeptEntity> invWarehouseEntities;
AuthAdmin authAdmin = customerService.getUserBean();
filterInvWarehouseRequest.setUserId(authAdmin.getId());
filterInvWarehouseRequest.setPid(0);
filterInvWarehouseRequest.setPid(0L);
invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities);
@ -181,7 +181,7 @@ public class DeptController {
}
//顶级部门
if (deptEntity.getPid() == null || deptEntity.getPid() == 0) {
deptEntity.setPid(0); // 默认设置
deptEntity.setPid(0L); // 默认设置
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setPid(deptEntity.getPid());
DeptEntity codeEntity = deptService.selectMaxCode(filterInvWarehouseRequest);

@ -128,8 +128,8 @@ public class InvBusUserController {
@AuthRuleAnnotation("")
@PostMapping("/spms/bus/user/warehouse/post")
public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
relBusRequset.getSelectActions().forEach(action ->
{
InvBusUserEntity invBusUserEntity = new InvBusUserEntity();

@ -612,7 +612,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/delWarehouseUser")
public BaseResponse deleteWarehouseUser(Integer id) {
public BaseResponse deleteWarehouseUser(Long id) {
if (null == id)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id);

@ -1,5 +1,6 @@
package com.glxp.api.controller.basic;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
@ -70,6 +71,7 @@ public class BasicBusTypeChangeController {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
}
basicBusTypeChangeEntity.setUpdateTime(new Date());
basicBusTypeChangeEntity.setId(IdUtil.getSnowflakeNextId());
basicBusTypeChangeService.insert(basicBusTypeChangeEntity);
return ResultVOUtils.success("更新成功");
}

@ -675,7 +675,7 @@ public class UdiRelevanceController extends BaseController {
UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
udiRlSupEntity.setUpdateTime(new Date());
udiRlSupEntity.setPrice(new BigDecimal(udiProductEntity.getPrice()));
udiRlSupEntity.setId(udiProductEntity.getRelSupId());
udiRlSupEntity.setId(Long.valueOf(udiProductEntity.getRelSupId()));
udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
}
if (falg) {

@ -495,7 +495,7 @@ public class IoCodeTempController extends BaseController {
//校验预验收库存是否已存在
if (bussinessTypeEntity.isScanPreIn()) {
if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库
if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库&& bussinessTypeEntity.isPreInBack()
String orderIds = addOrderRequest.getCheckPreInOrders();
if (StrUtil.isNotEmpty(orderIds)) {
String[] orderIdArray = orderIds.split(",");
@ -524,8 +524,11 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "未选择预验收入库单,请先选择预验收入库单!");
}
} else { //按库存出库
int preInCount = invPreinProductDetailService.findCountByCode(code);
} else if (bussinessTypeEntity.getBackPreinType() == 2) { //按货位出库
if (StrUtil.isEmpty(addOrderRequest.getCheckPreInSpaceCode()))
return ResultVOUtils.error(500, "" +
"请选择预验收货位!");
int preInCount = invPreinProductDetailService.findCountBySpaceCode(addOrderRequest.getCheckPreInSpaceCode(), code);
InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code);
if (preInCount <= 0) {
return ResultVOUtils.error(500, "预验收库存数量不足!");
@ -552,6 +555,36 @@ public class IoCodeTempController extends BaseController {
}
}
/**
* else { //按库存出库
* int preInCount = invPreinProductDetailService.findCountByCode(code);
* InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(code);
* if (preInCount <= 0) {
* return ResultVOUtils.error(500, "预验收库存数量不足!");
* } else {
* if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(udiEntity.getBatchNo())
* && !invPreinDetailEntity.getBatchNo().equals(udiEntity.getBatchNo())) {
* return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配!");
* }
* if (StrUtil.isNotEmpty(orderId)) {//非首次添加
* if (StrUtil.isEmpty(udiEntity.getSerialNo())) {//该单据已有该产品
* //无序列号,则可能存在多个预验收入库单
* IoCodeTempEntity codeTempEntity = codeTempService.findByUnique(orderId, code);
* if (codeTempEntity != null) {
* if (preInCount < (codeTempEntity.getMyCount() + 1)) {
* return ResultVOUtils.error(500, "超出预验收库存数量");
* }
* }
* } else {
* if (preInCount < 1) {
* return ResultVOUtils.error(500, "预验收库存数量不足");
* }
* }
* }
* }
* }
*/
}
// 是否检验寄售库存
@ -631,13 +664,13 @@ public class IoCodeTempController extends BaseController {
}
if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
if (bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1 && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);
} else
codeTempService.updateById(exitLocalEntity);
} else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
} else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);
@ -788,13 +821,13 @@ public class IoCodeTempController extends BaseController {
}
//是否边扫边校验
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() == 1) {
if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkCode(codeEnttity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);
} else
codeTempService.insert(codeEnttity);
} else if (bussinessTypeEntity.isCheckEnable() && (bussinessTypeEntity.getCheckWebNew() == 2 || (bussinessTypeEntity.getCheckWebNew() == 3 && addOrderRequest.getFromVailPi() == 1)) && addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL) {
} else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);

@ -1,5 +1,6 @@
package com.glxp.api.controller.thrsys;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.enums.ResultEnum;
@ -78,6 +79,7 @@ public class ThrDeptController {
thrDeptEntity.setPcode(pEntity.getPcode());
}
thrDeptEntity.setUpdateTime(new Date());
thrDeptEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = thrDeptService.insertInvWarehouse(thrDeptEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

@ -3,6 +3,7 @@ package com.glxp.api.controller.thrsys;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
@ -179,6 +180,7 @@ public class ThrProductsController {
thrProductsEntity.setCreateUser(String.valueOf(customerService.getUserId()));
thrProductsEntity.setUpdateTime(new Date());
thrProductsEntity.setCreateTime(new Date());
thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
thrProductsService.insertThrProducts(thrProductsEntity);
return ResultVOUtils.success();
}

@ -10,8 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao,WarehouseUserEntity,WarehouseUserEntity> {
int deleteByPrimaryKey(Integer id);
public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, WarehouseUserEntity, WarehouseUserEntity> {
int deleteByCodeAndId(@Param("id") Long id, @Param("code") String code);
@ -35,13 +34,13 @@ public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao,Wareho
int updateBatchSelective(List<WarehouseUserEntity> list);
int batchInsert(@Param("list") List<WarehouseUserEntity> list);
List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
List<WarehouseUserEntity> selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest);
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
List<String> selectCodeByUser(@Param("userId") String userId);
void deleteByCode(@Param("code") String code);

@ -10,7 +10,7 @@ import java.util.Date;
@TableName("auth_dept")
public class DeptEntity {
private Long id;
private Integer pid;
private Long pid;
private String code;
private String name;
private Boolean advanceType;

@ -11,7 +11,7 @@ import java.util.Date;
@Data
public class UdiRlSupEntity {
private Integer id;
private Long id;
private String customerId;
private String productId;
private String enterpriseId;

@ -6,7 +6,7 @@ import lombok.Data;
@Data
public class FilterInvUserRequest extends ListPageRequest {
private Integer id;
private Long id;
private String code;
private Long userid;
private String username;

@ -9,8 +9,8 @@ import java.util.List;
@Data
public class FilterInvWarehouseRequest extends ListPageRequest {
private Integer id;
private Integer pid;
private Long id;
private Long pid;
private String code;
private String name;
private String deptCode;

@ -29,5 +29,7 @@ public class AddOrderRequest {
private String remark;
private String checkPreInOrders;
// 预验收货位
private String checkPreInSpaceCode;
private int fromVailPi; //是否需要校验三期1不需要2需要
}

@ -10,7 +10,12 @@ import java.util.List;
@Data
public class PageSimpleResponse<T> {
// 总数
private Long total;
private Integer total;
// 列表
private List<T> list;
public void setTotal(Long total) {
this.total = total.intValue();
}
}

@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class UdiRlSupResponse {
private int id;
private Long id;
private Integer rlId;
private String thirdId;
private String thirdName;

@ -8,7 +8,7 @@ import java.util.Date;
@Data
public class ThrProductsResponse {
private Integer id;
private Long id;
private String code; //产品编码
private String name;
private String measname; //计量单位

@ -18,7 +18,7 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
* @return
*/
WarehouseUserEntity selectById(Integer id);
WarehouseUserEntity selectById(Long id);
List<WarehouseUserEntity> getListByCode(String code);
@ -48,7 +48,7 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
*
* @param id
*/
void deleteWarehouseUser(Integer id);
void deleteWarehouseUser(Long id);
void deleteByCodeAndId(Long id, String code);
@ -61,7 +61,8 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
* @return
*/
List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds")List<Long> userIds );
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
/**
*
@ -70,5 +71,6 @@ public interface WarehouseUserService extends IService<WarehouseUserEntity> {
* @return
*/
Integer countUserBySubInvCode(String subInvCode);
boolean insert(WarehouseUserEntity warehouseUserEntity);
}

@ -1,6 +1,7 @@
package com.glxp.api.service.auth.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.auth.WarehouseUserDao;
@ -28,7 +29,7 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
private WarehouseUserDao warehouseUserDao;
@Override
public WarehouseUserEntity selectById(Integer id) {
public WarehouseUserEntity selectById(Long id) {
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
filterInvUserRequest.setId(id);
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserDao.filterList(filterInvUserRequest);
@ -75,9 +76,10 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
warehouseUserEntity.setCode(code);
warehouseUserEntity.setUsername(user.getUserName());
warehouseUserEntity.setUserid(user.getId());
warehouseUserEntity.setId(IdUtil.getSnowflakeNextId());
warehouseUserEntities.add(warehouseUserEntity);
});
warehouseUserDao.batchInsert(warehouseUserEntities);
warehouseUserDao.insertBatch(warehouseUserEntities);
}
}
@ -100,9 +102,9 @@ public class WarehouseUserServiceImpl extends ServiceImpl<WarehouseUserDao, Ware
}
@Override
public void deleteWarehouseUser(Integer id) {
public void deleteWarehouseUser(Long id) {
if (null != id) {
warehouseUserDao.deleteByPrimaryKey(id);
warehouseUserDao.deleteById(id);
}
}

@ -1,17 +1,13 @@
package com.glxp.api.service.basic;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity;
import cn.hutool.core.util.IdUtil;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.basic.UdiRlSupEntity;
import com.glxp.api.req.basic.UdiInfoExportRequest;
import com.glxp.api.req.basic.UdiInfoRequest;
import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -39,6 +35,7 @@ public class CompanyProductsRelService {
udiRlSupEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
udiRlSupEntity.setUdiRlIdFk(uuid);
udiRlSupEntity.setCustomerId(udiInfoExportRequest.getUnitFk());
udiRlSupEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = udiRlSupService.insertCompanyProductRelevance(udiRlSupEntity);
}

@ -1,6 +1,7 @@
package com.glxp.api.service.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.dao.basic.UdiRelevanceDao;
@ -16,6 +17,7 @@ import com.glxp.api.service.thrsys.ThrProductsService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.udi.UdiInfoUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -206,6 +208,9 @@ public class UdiContrastService {
if (CollUtil.isNotEmpty(udiInfoEntities)) {
UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid());
if (udiProductEntity == null) {
for (UdiProductEntity udiInfoEntity : udiInfoEntities) {
udiInfoEntity.setId(IdUtil.getSnowflakeNextId());
}
udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
}
}

@ -803,7 +803,6 @@ public class IoCheckInoutService {
// ThreadUtil.execAsync(() -> {
if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) {
if (bussinessTypeEntity.getBackPreinType() == 1) { //按单退货
String orderIds = orderEntity.getCheckPreInOrders();
if (StrUtil.isNotEmpty(orderIds)) {
String[] orderIdArray = orderIds.split(",");
@ -861,7 +860,6 @@ public class IoCheckInoutService {
codeEntity.setReCount(udiCalCountUtil.getActCount(codeEntity.getNameCode()));
codeEntity.setWarehouseCode(orderEntity.getCheckPreInSpaceCode());
backCodeList.add(codeEntity);
}
}
genBackOrder(orderEntity, backCodeList);

@ -190,7 +190,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
@Override
public InvPreInProductDetailEntity findUseOneByCode(String code) {
List<InvPreInProductDetailEntity> invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>().eq("code", code)
.last("limit 1"));
.last("limit 1"));
if (CollUtil.isNotEmpty(invPreinDetailEntities)) {
return invPreinDetailEntities.get(0);
}

@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -68,6 +69,7 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl<ThrBusTypeOriginDao
public boolean insertBusOriginType(ThrBusTypeOriginEntity thrBusTypeOriginEntity) {
//设置创建信息
setUpdateInfo(thrBusTypeOriginEntity);
thrBusTypeOriginEntity.setId(IdUtil.getSnowflakeNextId());
return thrBusTypeOriginDao.insertBusOriginType(thrBusTypeOriginEntity);
}

@ -43,7 +43,7 @@ logging:
level:
com.glxp.api.dao: debug
file_path: /udi/udiwms/udiwmsfile/
file_path: D:/udi/udiwms/udiwmsfile/
back_file_path: /share/udisps/back/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.auth.InvBusUserDao">
<select id="filterInvBusUser" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
resultType="com.glxp.api.entity.auth.InvBusUserEntity">
select *
@ -17,46 +16,43 @@
<if test="scAction != '' and scAction != null">
AND scAction = #{scAction}
</if>
<if test="selectedCodes != null and selectedCodes.size()!=0">
<if test="selectedCodes != null and selectedCodes.size() != 0">
and scAction not in
<foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</select>
<select id="filterUnSelect" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
resultType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
select auth_warehouse_bustype.id,
auth_warehouse_bustype.code,
auth_warehouse_bustype.action,
basic_bussiness_type.name
auth_warehouse_bustype.code,
auth_warehouse_bustype.action,
basic_bussiness_type.name
from auth_warehouse_bustype
inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action
inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action
<where>
<if test="subInvCode != '' and subInvCode != null">
AND code = #{subInvCode}
</if>
<if test="selectedCodes != null and selectedCodes.size()!=0">
<if test="selectedCodes != null and selectedCodes.size() != 0">
and auth_warehouse_bustype.action not in
<foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</select>
<select id="filterJoinInvBusUser" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
resultType="com.glxp.api.res.auth.InvBusUserResponse">
select auth_user_bustype.*,basic_bussiness_type.name billTypeName
FROM auth_user_bustype left join basic_bussiness_type on auth_user_bustype.scAction = basic_bussiness_type.action
select auth_user_bustype.*, basic_bussiness_type.name billTypeName
FROM auth_user_bustype
left join basic_bussiness_type on auth_user_bustype.scAction = basic_bussiness_type.action
<where>
<if test="userId != '' and userId != null">
AND userId = #{userId}
@ -67,24 +63,20 @@
<if test="scAction != '' and scAction != null">
AND scAction = #{scAction}
</if>
</where>
group by auth_user_bustype.id
</select>
<insert id="insertInvBusUser"
parameterType="com.glxp.api.entity.auth.InvBusUserEntity">
replace
INTO auth_user_bustype
(userId, `subInvCode`, scAction, remark,updateTime)
values (
#{userId},
#{subInvCode},
#{scAction},
#{remark},now()
)
INTO auth_user_bustype
(userId, `subInvCode`, scAction, remark, updateTime)
values (#{userId},
#{subInvCode},
#{scAction},
#{remark}, now())
</insert>
@ -103,28 +95,35 @@
<delete id="deleteByscAction" parameterType="Map">
DELETE
FROM auth_user_bustype
<where>
<if test="subInvCode != '' and subInvCode != null">
AND subInvCode = #{subInvCode}
</if>
<if test="selectedCodes != null and selectedCodes.size()!=0">
and scAction in
<foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
<where>
<if test="subInvCode != '' and subInvCode != null">
AND subInvCode = #{subInvCode}
</if>
<if test="selectedCodes != null and selectedCodes.size() != 0">
and scAction in
<foreach collection="selectedCodes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
</delete>
<update id="updateInvBusUser" parameterType="com.glxp.api.entity.auth.InvBusUserEntity">
UPDATE auth_user_bustype
<trim prefix="set" suffixOverrides=",">
<if test="userId != null">
userId=#{userId},
</if>
<if test="subInvCode != null">
subInvCode=#{subInvCode},
</if>
<if test="scAction != null">
scAction=#{scAction},
</if>
<if test="remark != null">
remark=#{remark},
</if>
updateTime=now()
<if test="userId != null">userId=#{userId},</if>
<if test="subInvCode != null">subInvCode=#{subInvCode},</if>
<if test="scAction != null">scAction=#{scAction},</if>
<if test="remark != null">remark=#{remark},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -38,12 +38,6 @@
</if>
</where>
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<!--@mbg.generated-->
delete
from auth_warehouse_user
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByCodeAndId">
<!--@mbg.generated-->
delete
@ -101,7 +95,7 @@
</if>
</set>
isDirector = #{isDirector}
where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.glxp.api.entity.auth.WarehouseUserEntity">
<!--@mbg.generated-->
@ -167,16 +161,6 @@
#{item.id,jdbcType=INTEGER}
</foreach>
</update>
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into auth_warehouse_user
(code, userId, userName, isDirector)
values
<foreach collection="list" item="item" separator=",">
(#{item.code,jdbcType=VARCHAR}, #{item.userid,jdbcType=BIGINT}, #{item.username,jdbcType=VARCHAR},
#{item.isDirector})
</foreach>
</insert>
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseUserEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
@ -205,9 +189,9 @@
<if test="id != null">
id = #{id,jdbcType=INTEGER},
</if>
code = #{code,jdbcType=VARCHAR},
userId = #{userid,jdbcType=BIGINT},
userName = #{username,jdbcType=VARCHAR},
code = #{code,jdbcType=VARCHAR},
userId = #{userid,jdbcType=BIGINT},
userName = #{username,jdbcType=VARCHAR},
</trim>
</insert>
<insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
@ -263,7 +247,7 @@
<select id="selectListByCode" resultMap="BaseResultMap">
select auth_warehouse_user.*, auth_user.employeeName
from auth_warehouse_user
inner join auth_user on auth_user.id = auth_warehouse_user.userId
inner join auth_user on auth_user.id = auth_warehouse_user.userId
where code = #{code}
</select>
@ -271,7 +255,7 @@
parameterType="com.glxp.api.req.auth.FilterInvLinkDataRequest">
select auth_warehouse_user.*, auth_user.employeeName
from auth_warehouse_user
inner join auth_user on auth_user.id = auth_warehouse_user.userId
inner join auth_user on auth_user.id = auth_warehouse_user.userId
<where>
<if test="code != '' and code != null">
AND code = #{code}

@ -229,7 +229,7 @@
<insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
replace INTO basic_products
(uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
(id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
@ -241,7 +241,8 @@
<foreach collection="udiInfoEntities" item="item" index="index"
separator=",">
(#{item.uuid},
(#{item.id},
#{item.uuid},
#{item.originUuid},
#{item.nameCode},
#{item.deviceRecordKey},

@ -285,10 +285,10 @@
<insert id="insertCompanyProductRelevance"
parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
replace
INTO company_product_relevance(customerId, productId, enterpriseId, registrationId,
INTO company_product_relevance(id,customerId, productId, enterpriseId, registrationId,
createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
price, createUser, updateUser)
values (#{customerId},
values (#{id},#{customerId},
#{productId},
#{enterpriseId},
#{registrationId},

@ -34,7 +34,7 @@
parameterType="com.glxp.api.entity.sync.BasicDownloadStatusEntity">
replace
INTO basic_download_status(id, taskId, idDatas, status, type, updateTime, scheduleType, startTime,
endTime, remark)
endTime, remark,cacheFilePath)
values (#{id},
#{taskId},
#{idDatas},
@ -44,7 +44,8 @@
#{scheduleType},
#{startTime},
#{endTime},
#{remark})
#{remark},
#{cacheFilePath})
</insert>
<update id="updateDownloadStatus" parameterType="com.glxp.api.entity.sync.BasicDownloadStatusEntity">

@ -33,7 +33,7 @@
<insert id="insertExportStatus" keyProperty="id"
parameterType="com.glxp.api.entity.sync.BasicExportStatusEntity">
replace
INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark)
INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark,cacheFilePath)
values(
#{id},
#{idDatas},
@ -43,7 +43,8 @@
#{scheduleType},
#{startTime},
#{endTime},
#{remark}
#{remark},
#{cacheFilePath}
)
</insert>

@ -75,9 +75,10 @@
<insert id="insertBusOriginType" parameterType="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
replace
into thr_bustype_origin
(`name`, `action`, thirdSys, `enable`, inoutType, updateTime, remark, createUser, updateUser,
(id,`name`, `action`, thirdSys, `enable`, inoutType, updateTime, remark, createUser, updateUser,
createTime)
values (#{name},
values (#{id},
#{name},
#{action},
#{thirdSys},
#{enable},

@ -83,9 +83,10 @@
parameterType="com.glxp.api.entity.thrsys.ThrDeptEntity">
replace
INTO thr_dept
(pid, code, name, advanceType, isDefault,
(id,pid, code, name, advanceType, isDefault,
status, updateTime, remark, thirdSysFk)
values (
#{id},
#{pid},
#{code},
#{name},

@ -154,10 +154,11 @@
parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity">
replace
INTO thr_products
(code, `name`, measname, spec, registerNo, manufactory,
(id,code, `name`, measname, spec, registerNo, manufactory,
cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,price,createUser,createTime,updateUser)
values (
#{id},
#{code},
#{name},
#{measname},

@ -382,3 +382,10 @@ CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);

Loading…
Cancel
Save