Merge remote-tracking branch 'origin/master'

master
郑明梁 2 years ago
commit 3bb024b549

@ -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_BIZ = 1;
public static final Integer ORDER_TYPE_SCAN = 2; public static final Integer ORDER_TYPE_SCAN = 2;
public static final Integer ORDER_TYPE_NORMAL = 3; public static final Integer ORDER_TYPE_NORMAL = 3;
public static final Integer ORDER_TYPE_WAIT = 4;
/** /**
* *

@ -1,6 +1,7 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
@ -228,6 +229,7 @@ public class DeptController extends BaseController {
deptEntity.setPcode(deptEntity.getPcode()); deptEntity.setPcode(deptEntity.getPcode());
} }
deptEntity.setUpdateTime(new Date()); deptEntity.setUpdateTime(new Date());
deptEntity.setId(IdUtil.getSnowflakeNextId());
boolean b = deptService.insertInvWarehouse(deptEntity); boolean b = deptService.insertInvWarehouse(deptEntity);
if (!b) { if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

@ -79,6 +79,11 @@ public class DeptUserController {
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setUserId(deptUserEntity.getUserId()); filterDeptUserReqeust.setUserId(deptUserEntity.getUserId());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
for (int i = 0; i < deptUserEntities.size(); i++) {
if (deptUserEntities.get(i).getDeptId() == 1) {
deptUserEntities.remove(deptUserEntities.get(i));
}
}
if (deptUserEntities != null && deptUserEntities.size() > 1) { if (deptUserEntities != null && deptUserEntities.size() > 1) {
return ResultVOUtils.error(500, "该用户已绑定多个部门,不能移除!"); return ResultVOUtils.error(500, "该用户已绑定多个部门,不能移除!");
} }

@ -1,6 +1,7 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -131,7 +132,7 @@ public class InvBusUserController {
@PostMapping("/spms/bus/user/warehouse/post") @PostMapping("/spms/bus/user/warehouse/post")
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) { public BaseResponse postRes(@RequestBody UpdateUserRelBusRequset relBusRequset) {
boolean b = invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode()); invBusUserService.deleteByUnion(relBusRequset.getUserId(), relBusRequset.getSubInvCode());
if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) { if (CollUtil.isNotEmpty(relBusRequset.getSelectActions())) {
relBusRequset.getSelectActions().forEach(action -> relBusRequset.getSelectActions().forEach(action ->
{ {
@ -139,7 +140,8 @@ public class InvBusUserController {
invBusUserEntity.setUserId(relBusRequset.getUserId()); invBusUserEntity.setUserId(relBusRequset.getUserId());
invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode()); invBusUserEntity.setSubInvCode(relBusRequset.getSubInvCode());
invBusUserEntity.setScAction(action); invBusUserEntity.setScAction(action);
invBusUserService.insertInvBusUser(invBusUserEntity); invBusUserEntity.setId(IdUtil.getSnowflakeNextId());
invBusUserService.save(invBusUserEntity);
}); });
} }
InvBusUserEntity invBusUserEntity = new InvBusUserEntity(); InvBusUserEntity invBusUserEntity = new InvBusUserEntity();

@ -583,7 +583,7 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/delWarehouseUser") @PostMapping("/warehouse/inout/delWarehouseUser")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
public BaseResponse deleteWarehouseUser(Integer id) { public BaseResponse deleteWarehouseUser(Long id) {
if (null == id) if (null == id)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id); WarehouseUserEntity warehouseUserEntity = warehouseUserService.selectById(id);

@ -1,5 +1,6 @@
package com.glxp.api.controller.auth; package com.glxp.api.controller.auth;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -351,6 +352,7 @@ public class RegisterController {
if (registerCheckRequest.getCheckType() == 1) { if (registerCheckRequest.getCheckType() == 1) {
//注册时新增到往来单位字典 //注册时新增到往来单位字典
BasicUnitMaintainEntity basicUnitMaintainEntity1 = new BasicUnitMaintainEntity(); BasicUnitMaintainEntity basicUnitMaintainEntity1 = new BasicUnitMaintainEntity();
basicUnitMaintainEntity1.setId(IdUtil.getSnowflakeNextId());
basicUnitMaintainEntity1.setName(userRegisterEntity.getCompanyName()); basicUnitMaintainEntity1.setName(userRegisterEntity.getCompanyName());
basicUnitMaintainEntity1.setErpId(generateUserId() + ""); basicUnitMaintainEntity1.setErpId(generateUserId() + "");
basicUnitMaintainEntity1.setCorpType(2); basicUnitMaintainEntity1.setCorpType(2);

@ -3,6 +3,7 @@ package com.glxp.api.controller.auth;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -194,7 +195,7 @@ public class SysUserController extends BaseController {
String pid = invWarehouseService.selectParentIdByCode(authUserSaveRequest.getLocInvCode()); String pid = invWarehouseService.selectParentIdByCode(authUserSaveRequest.getLocInvCode());
authAdmin.setLocDeptCode(pid); authAdmin.setLocDeptCode(pid);
authAdmin.setLocInvCode(authUserSaveRequest.getLocInvCode()); authAdmin.setLocInvCode(authUserSaveRequest.getLocInvCode());
authAdmin.setId(IdUtil.getSnowflakeNextId());
boolean b = userService.insertAuthAdmin(authAdmin); boolean b = userService.insertAuthAdmin(authAdmin);
authAdmin = userService.findByUserName(authAdmin.getUserName()); authAdmin = userService.findByUserName(authAdmin.getUserName());
if (!b) { if (!b) {
@ -220,7 +221,6 @@ public class SysUserController extends BaseController {
authUserSaveRequest.setDepts(deptCodeList); authUserSaveRequest.setDepts(deptCodeList);
//插入部门 //插入部门
if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) { if (CollUtil.isNotEmpty(authUserSaveRequest.getDepts())) {
List<DeptUserEntity> list = new ArrayList<>(); List<DeptUserEntity> list = new ArrayList<>();
@ -228,6 +228,7 @@ public class SysUserController extends BaseController {
DeptUserEntity deptUserEntity = new DeptUserEntity(); DeptUserEntity deptUserEntity = new DeptUserEntity();
deptUserEntity.setUserId(authAdmin.getId()); deptUserEntity.setUserId(authAdmin.getId());
deptUserEntity.setDeptId(authUserSaveRequest.getDepts().get(i)); deptUserEntity.setDeptId(authUserSaveRequest.getDepts().get(i));
deptUserEntity.setUpdateTime(new Date());
list.add(deptUserEntity); list.add(deptUserEntity);
} }
deptUserService.insertBatch(list); deptUserService.insertBatch(list);
@ -327,6 +328,7 @@ public class SysUserController extends BaseController {
DeptUserEntity deptUserEntity = new DeptUserEntity(); DeptUserEntity deptUserEntity = new DeptUserEntity();
deptUserEntity.setUserId(authUserSaveRequest.getId()); deptUserEntity.setUserId(authUserSaveRequest.getId());
deptUserEntity.setDeptId(authUserSaveRequest.getDepts().get(i)); deptUserEntity.setDeptId(authUserSaveRequest.getDepts().get(i));
deptUserEntity.setUpdateTime(new Date());
list.add(deptUserEntity); list.add(deptUserEntity);
} }
deptUserService.insertBatch(list); deptUserService.insertBatch(list);

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

@ -195,10 +195,10 @@ public class BasicBusTypePreController {
} }
if (basicBusTypePreEntity != null) { if (basicBusTypePreEntity != null) {
//判断是否重复添加 //判断是否重复添加
boolean result = basicBusTypePreService.verifyExists(basicBusTypePreEntity);
if (result) { BasicBusTypePreEntity exitEntity = basicBusTypePreService.findByOriginAction(basicBusTypePreEntity.getOriginAction());
if (exitEntity != null)
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在,不允许重复添加!"); return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在,不允许重复添加!");
}
if (StrUtil.isNotBlank(basicBusTypePreEntity.getDefaultInvCode())) { if (StrUtil.isNotBlank(basicBusTypePreEntity.getDefaultInvCode())) {
InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getDefaultInvCode()); InvWarehouseEntity invWarehouse = invWarehouseService.findByInvSubByCode(basicBusTypePreEntity.getDefaultInvCode());

@ -379,12 +379,10 @@ public class UdiRelevanceController extends BaseController {
//新增或修改关联 //新增或修改关联
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udi/udirel/check/udi") @PostMapping("/udi/udirel/check/udi")
public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) { public BaseResponse checkUdi(@RequestBody UdiCombineRequest udiCombineRequest) {
List<String> keys = udiCombineRequest.getKeys(); List<String> keys = udiCombineRequest.getKeys();
if (keys != null && keys.size() > 0) { if (keys != null && keys.size() > 0) {
List<UdiRelevanceEntity> datas = udiRelevanceService.batchSelectByUuid(keys); List<UdiRelevanceEntity> datas = udiRelevanceService.batchSelectByUuid(keys);
if (datas.isEmpty()) { if (datas.isEmpty()) {
return ResultVOUtils.success("无被选入!"); return ResultVOUtils.success("无被选入!");

@ -632,13 +632,13 @@ public class IoCodeTempController extends BaseController {
} }
if (StringUtils.isBlank(exitLocalEntity.getSerialNo())) { 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); String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
if (errMsg != null) { if (errMsg != null) {
return ResultVOUtils.error(500, errMsg); return ResultVOUtils.error(500, errMsg);
} else } else
codeTempService.updateById(exitLocalEntity); 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); String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity);
if (errMsg != null) { if (errMsg != null) {
return ResultVOUtils.error(500, errMsg); return ResultVOUtils.error(500, errMsg);
@ -784,13 +784,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); String errMsg = ioCheckInoutService.checkCode(codeEnttity);
if (errMsg != null) { if (errMsg != null) {
return ResultVOUtils.error(500, errMsg); return ResultVOUtils.error(500, errMsg);
} else } else
codeTempService.insert(codeEnttity); 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); String errMsg = ioCheckInoutService.checkNoPiCode(codeEnttity);
if (errMsg != null) { if (errMsg != null) {
return ResultVOUtils.error(500, errMsg); return ResultVOUtils.error(500, errMsg);

@ -11,9 +11,7 @@ import java.util.List;
@Mapper @Mapper
public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussinessTypeDao, WarehouseBussinessTypeEntity, WarehouseBussinessTypeEntity> { public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussinessTypeDao, WarehouseBussinessTypeEntity, WarehouseBussinessTypeEntity> {
WarehouseBussinessTypeEntity selectById(Integer id);
int deleteByPrimaryKey(Integer id);
int insertSelective(WarehouseBussinessTypeEntity record); int insertSelective(WarehouseBussinessTypeEntity record);
@ -27,7 +25,6 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus<WarehouseBussi
int updateBatchSelective(List<WarehouseBussinessTypeEntity> list); int updateBatchSelective(List<WarehouseBussinessTypeEntity> list);
int batchInsert(@Param("list") List<WarehouseBussinessTypeEntity> list);
List<WarehouseBussinessTypeEntity> selectListByCode(@Param("code") String code); List<WarehouseBussinessTypeEntity> selectListByCode(@Param("code") String code);

@ -35,7 +35,6 @@ public interface WarehouseUserDao extends BaseMapperPlus<WarehouseUserDao, Wareh
int updateBatchSelective(List<WarehouseUserEntity> list); int updateBatchSelective(List<WarehouseUserEntity> list);
int batchInsert(@Param("list") List<WarehouseUserEntity> list);
List<WarehouseUserEntity> selectListByCode(@Param("code") String code); List<WarehouseUserEntity> selectListByCode(@Param("code") String code);

@ -24,7 +24,7 @@ public interface SystemParamConfigDao extends BaseMapperPlus<SystemParamConfigDa
String selectValueByParamKey(String key); String selectValueByParamKey(String key);
boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest); boolean updateEntityById(SysParamConfigSaveRequest sysParamConfigSaveRequest);
boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest); boolean updateParentId(SysParamConfigSaveRequest sysParamConfigSaveRequest);

@ -8,7 +8,7 @@ import java.util.Date;
@Data @Data
public class BasicUnitMaintainEntity { public class BasicUnitMaintainEntity {
private Integer id; private Long id;
private String erpId; private String erpId;
@NotBlank(message = "往来单位名称不能为空!") @NotBlank(message = "往来单位名称不能为空!")

@ -244,4 +244,12 @@ public class IoOrderEntity {
@TableField(value = "checkPreInOrders") @TableField(value = "checkPreInOrders")
private String checkPreInOrders; private String checkPreInOrders;
// 预验收按货位出库,退货
@TableField(value = "checkPreInInvCode")
private String checkPreInInvCode;
// 预验收按货位出库,退货
@TableField(value = "checkPreInSpaceCode")
private String checkPreInSpaceCode;
} }

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

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

@ -12,7 +12,7 @@ public class BasicBussinessTypeResponse {
/** /**
* ID * ID
*/ */
private Integer id; private Long id;
/** /**
* *

@ -18,7 +18,7 @@ public interface WarehouseUserService {
* @return * @return
*/ */
WarehouseUserEntity selectById(Integer id); WarehouseUserEntity selectById(Long id);
List<WarehouseUserEntity> getListByCode(String code); List<WarehouseUserEntity> getListByCode(String code);
@ -48,7 +48,7 @@ public interface WarehouseUserService {
* *
* @param id * @param id
*/ */
void deleteWarehouseUser(Integer id); void deleteWarehouseUser(Long id);
void deleteByCodeAndId(Long id, String code); void deleteByCodeAndId(Long id, String code);
@ -61,6 +61,7 @@ public interface WarehouseUserService {
* @return * @return
*/ */
List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds); List<WarehouseUserEntity> selectNotSelectUserid(@Param("userIds") List<Long> userIds);
/** /**

@ -68,14 +68,14 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
}); });
//加入新数据 //加入新数据
warehouseBussinessTypeDao.batchInsert(warehouseBussinessTypeEntities); warehouseBussinessTypeDao.insertBatch(warehouseBussinessTypeEntities);
} }
} }
@Override @Override
public void deleteWarehouseByssuinessType(Integer id) { public void deleteWarehouseByssuinessType(Integer id) {
if (null != id) { if (null != id) {
warehouseBussinessTypeDao.deleteByPrimaryKey(id); warehouseBussinessTypeDao.deleteById(id);
} }
} }

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

@ -80,4 +80,6 @@ public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity>
* @return * @return
*/ */
boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity); boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity);
} }

@ -84,7 +84,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
* @param basicBussinessTypeEntity * @param basicBussinessTypeEntity
*/ */
private void setSupplementOrderType(BasicBussinessTypeEntity basicBussinessTypeEntity) { private void setSupplementOrderType(BasicBussinessTypeEntity basicBussinessTypeEntity) {
if (null == basicBussinessTypeEntity.getId()) { boolean isExit = basicBussinessTypeDao.exists(new QueryWrapper<BasicBussinessTypeEntity>().eq(basicBussinessTypeEntity.getId() != null, "id", basicBussinessTypeEntity.getId()));
if (null == basicBussinessTypeEntity.getId() || !isExit) {
//处理添加新单据类型时的平衡补单逻辑 //处理添加新单据类型时的平衡补单逻辑
if (StrUtil.isNotBlank(basicBussinessTypeEntity.getSupplementOrderType())) { if (StrUtil.isNotBlank(basicBussinessTypeEntity.getSupplementOrderType())) {
//查询平衡补单的单据类型数据是否存在 //查询平衡补单的单据类型数据是否存在

@ -72,7 +72,7 @@ public class SystemParamConfigServiceImpl extends ServiceImpl<SystemParamConfigD
@Override @Override
public boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest) { public boolean updateById(SysParamConfigSaveRequest sysParamConfigSaveRequest) {
sysParamConfigSaveRequest.setUpdateTime(new Date()); sysParamConfigSaveRequest.setUpdateTime(new Date());
return systemParamConfigDao.updateById(sysParamConfigSaveRequest); return systemParamConfigDao.updateEntityById(sysParamConfigSaveRequest);
} }
@Override @Override

@ -77,10 +77,10 @@
</select> </select>
<insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin"> <insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin">
INSERT INTO auth_user( userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag INSERT INTO auth_user( id, userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag
, employeeName, CustomerId, lastModifyTime, locDeptCode, locInvCode, comments) , employeeName, CustomerId, lastModifyTime, locDeptCode, locInvCode, comments)
values values
(#{userName}, (#{id}, #{userName},
<choose> <choose>
<when test="passWord != null"> <when test="passWord != null">
#{passWord}, #{passWord},
@ -119,7 +119,8 @@
<insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin"> <insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.api.entity.auth.AuthAdmin">
replace replace
INTO auth_user(id, userName, passWord, lastLoginIp, INTO auth_user(id, userName, passWord, lastLoginIp,
lastLoginTime, createTime, userFlag, lastModifyTime, employeeName, CustomerId, locDeptCode, lastLoginTime, createTime, userFlag, lastModifyTime, employeeName, CustomerId,
locDeptCode,
locInvCode, comments) locInvCode, comments)
values (#{id}, values (#{id},
#{userName}, #{userName},

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!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.DeptDao"> <mapper namespace="com.glxp.api.dao.auth.DeptDao">
<select id="filterInvWarehouse" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <select id="filterInvWarehouse" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.DeptEntity"> resultType="com.glxp.api.entity.auth.DeptEntity">
select *, (select name from auth_dept WHERE a.pcode = code) pName select *, (select name from auth_dept WHERE a.pcode = code) pName
@ -38,14 +37,13 @@
<if test="spUse != null"> <if test="spUse != null">
AND a.spUse = #{spUse} AND a.spUse = #{spUse}
</if> </if>
</where> </where>
</select> </select>
<select id="filterAllByUser" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <select id="filterAllByUser" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.DeptEntity"> resultType="com.glxp.api.entity.auth.DeptEntity">
select auth_dept.* from auth_dept INNER JOIN auth_warehouse select auth_dept.* from auth_dept
INNER JOIN auth_warehouse
on auth_dept.`code` = auth_warehouse.parentId on auth_dept.`code` = auth_warehouse.parentId
<if test="CustomerId != '' and CustomerId != null"> <if test="CustomerId != '' and CustomerId != null">
INNER JOIN auth_warehouse_user on auth_warehouse_user.`code` = auth_warehouse.code INNER JOIN auth_warehouse_user on auth_warehouse_user.`code` = auth_warehouse.code
@ -84,7 +82,6 @@
</if> </if>
</where> </where>
group by auth_dept.code group by auth_dept.code
</select> </select>
@ -93,7 +90,6 @@
SELECT * SELECT *
FROM auth_dept FROM auth_dept
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectByIdCode" <select id="selectByIdCode"
@ -108,12 +104,12 @@
</foreach> </foreach>
</if> </if>
</where> </where>
</select> </select>
<select id="selectMaxCode" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <select id="selectMaxCode" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.DeptEntity"> resultType="com.glxp.api.entity.auth.DeptEntity">
select max(code) as code from auth_dept select max(code) as code
from auth_dept
<where> <where>
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND id = #{id} AND id = #{id}
@ -140,13 +136,13 @@
AND `level` = #{level} AND `level` = #{level}
</if> </if>
</where> </where>
</select> </select>
<select id="filterGroupInvWarehouse" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <select id="filterGroupInvWarehouse" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.DeptEntity"> resultType="com.glxp.api.entity.auth.DeptEntity">
SELECT * FROM auth_dept SELECT *
FROM auth_dept
<where> <where>
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND id = #{id} AND id = #{id}
@ -176,13 +172,16 @@
AND spUse = #{spUse} AND spUse = #{spUse}
</if> </if>
<if test="updateTime != null and updateTime != ''"> <if test="updateTime != null and updateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
<if test="lastUpdateTime != null and lastUpdateTime != ''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
]]>
</if> </if>
</where> </where>
</select> </select>
<select id="getNameByCode" resultType="java.lang.String"> <select id="getNameByCode" resultType="java.lang.String">
select name select name
@ -198,10 +197,9 @@
parameterType="com.glxp.api.entity.auth.DeptEntity"> parameterType="com.glxp.api.entity.auth.DeptEntity">
replace replace
INTO auth_dept INTO auth_dept
(pid, code, `name`, advanceType, isDefault, (id, pid, code, `name`, advanceType, isDefault,
status, updateTime, remark, `level`, pcode, spUse, thirdId, thirdId1, thirdId2, thirdId3, thirdId4) status, updateTime, remark, `level`, pcode, spUse, thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
values ( values (#{id}, #{pid},
#{pid},
#{code}, #{code},
#{name}, #{name},
#{advanceType}, #{advanceType},
@ -216,8 +214,7 @@
#{thirdId1}, #{thirdId1},
#{thirdId2}, #{thirdId2},
#{thirdId3}, #{thirdId3},
#{thirdId4} #{thirdId4})
)
</insert> </insert>
@ -234,30 +231,59 @@
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")"> <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</select> </select>
<update id="updateInvWarehouse" parameterType="com.glxp.api.entity.auth.DeptEntity"> <update id="updateInvWarehouse" parameterType="com.glxp.api.entity.auth.DeptEntity">
UPDATE auth_dept UPDATE auth_dept
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="pid != null">pid=#{pid},</if> <if test="pid != null">
<if test="name != null">name=#{name},</if> pid=#{pid},
<if test="code != null">code=#{code},</if> </if>
<if test="advanceType != null">advanceType=#{advanceType},</if> <if test="name != null">
<if test="isDefault != null">isDefault=#{isDefault},</if> name=#{name},
<if test="status != null">status=#{status},</if> </if>
<if test="updateTime != null">updateTime=#{updateTime},</if> <if test="code != null">
<if test="remark != null">remark=#{remark},</if> code=#{code},
<if test="level != null">level=#{level},</if> </if>
<if test="pcode != null">pcode=#{pcode},</if> <if test="advanceType != null">
<if test="thirdId != null">remark=#{thirdId},</if> advanceType=#{advanceType},
<if test="thirdId1 != null">remark=#{thirdId1},</if> </if>
<if test="thirdId2 != null">remark=#{thirdId2},</if> <if test="isDefault != null">
<if test="thirdId3 != null">remark=#{thirdId3},</if> isDefault=#{isDefault},
<if test="thirdId4 != null">remark=#{thirdId4},</if> </if>
<if test="spUse != null">spUse=#{spUse},</if> <if test="status != null">
status=#{status},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="level != null">
level=#{level},
</if>
<if test="pcode != null">
pcode=#{pcode},
</if>
<if test="thirdId != null">
remark=#{thirdId},
</if>
<if test="thirdId1 != null">
remark=#{thirdId1},
</if>
<if test="thirdId2 != null">
remark=#{thirdId2},
</if>
<if test="thirdId3 != null">
remark=#{thirdId3},
</if>
<if test="thirdId4 != null">
remark=#{thirdId4},
</if>
<if test="spUse != null">
spUse=#{spUse},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
@ -308,28 +334,42 @@
</select> </select>
<select id="selectNameByCode" resultType="java.lang.String"> <select id="selectNameByCode" resultType="java.lang.String">
select name from auth_dept where code = #{code} select name
from auth_dept
where code = #{code}
</select> </select>
<select id="selectByPcode" resultType="com.glxp.api.entity.auth.DeptEntity"> <select id="selectByPcode" resultType="com.glxp.api.entity.auth.DeptEntity">
select * from auth_dept where pcode = #{pcode} select *
from auth_dept
where pcode = #{pcode}
</select> </select>
<select id="selectupDeptAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.auth.DeptEntity"> <select id="selectupDeptAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.auth.DeptEntity">
with recursive table_a as ( with recursive table_a as (
select * from auth_dept ta where code = #{pcode} select *
from auth_dept ta
where code = #{pcode}
union all union all
select tb.* from auth_dept tb inner join table_a on table_a.pcode = tb.code select tb.*
from auth_dept tb
inner join table_a on table_a.pcode = tb.code
) )
select * from table_a select *
from table_a
</select> </select>
<select id="selectLowDeptAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.auth.DeptEntity"> <select id="selectLowDeptAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.auth.DeptEntity">
with recursive table_a as ( with recursive table_a as (
select * from auth_dept ta where pcode = #{pcode} select *
from auth_dept ta
where pcode = #{pcode}
union all union all
select tb.* from auth_dept tb inner join table_a on table_a.code = tb.pcode select tb.*
from auth_dept tb
inner join table_a on table_a.code = tb.pcode
) )
select * from table_a select *
from table_a
</select> </select>
</mapper> </mapper>

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!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"> <mapper namespace="com.glxp.api.dao.auth.InvBusUserDao">
<select id="filterInvBusUser" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest" <select id="filterInvBusUser" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
resultType="com.glxp.api.entity.auth.InvBusUserEntity"> resultType="com.glxp.api.entity.auth.InvBusUserEntity">
select * select *
@ -23,9 +22,7 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
</where> </where>
</select> </select>
@ -47,16 +44,15 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
</where> </where>
</select> </select>
<select id="filterJoinInvBusUser" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest" <select id="filterJoinInvBusUser" parameterType="com.glxp.api.req.auth.FilterInvBusUserRequest"
resultType="com.glxp.api.res.auth.InvBusUserResponse"> resultType="com.glxp.api.res.auth.InvBusUserResponse">
select auth_user_bustype.*, basic_bussiness_type.name billTypeName 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 FROM auth_user_bustype
left join basic_bussiness_type on auth_user_bustype.scAction = basic_bussiness_type.action
<where> <where>
<if test="userId != '' and userId != null"> <if test="userId != '' and userId != null">
AND userId = #{userId} AND userId = #{userId}
@ -67,24 +63,20 @@
<if test="scAction != '' and scAction != null"> <if test="scAction != '' and scAction != null">
AND scAction = #{scAction} AND scAction = #{scAction}
</if> </if>
</where> </where>
group by auth_user_bustype.id group by auth_user_bustype.id
</select> </select>
<insert id="insertInvBusUser" keyProperty="id" <insert id="insertInvBusUser"
parameterType="com.glxp.api.entity.auth.InvBusUserEntity"> parameterType="com.glxp.api.entity.auth.InvBusUserEntity">
replace replace
INTO auth_user_bustype INTO auth_user_bustype
(userId, `subInvCode`, scAction, remark) (userId, `subInvCode`, scAction, remark)
values ( values (#{userId},
#{userId},
#{subInvCode}, #{subInvCode},
#{scAction}, #{scAction},
#{remark} #{remark})
)
</insert> </insert>
@ -118,12 +110,19 @@
<update id="updateInvBusUser" parameterType="com.glxp.api.entity.auth.InvBusUserEntity"> <update id="updateInvBusUser" parameterType="com.glxp.api.entity.auth.InvBusUserEntity">
UPDATE auth_user_bustype UPDATE auth_user_bustype
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="userId != null">userId=#{userId},</if> <if test="userId != null">
<if test="subInvCode != null">subInvCode=#{subInvCode},</if> userId=#{userId},
<if test="scAction != null">scAction=#{scAction},</if> </if>
<if test="remark != null">remark=#{remark},</if> <if test="subInvCode != null">
subInvCode=#{subInvCode},
</if>
<if test="scAction != null">
scAction=#{scAction},
</if>
<if test="remark != null">
remark=#{remark},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
</mapper> </mapper>

@ -20,12 +20,6 @@
from auth_warehouse_bustype from auth_warehouse_bustype
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<!--@mbg.generated-->
delete
from auth_warehouse_bustype
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insertSelective" keyColumn="id" keyProperty="id" <insert id="insertSelective" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true"> parameterType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity" useGeneratedKeys="true">
@ -135,15 +129,6 @@
#{item.id,jdbcType=INTEGER} #{item.id,jdbcType=INTEGER}
</foreach> </foreach>
</update> </update>
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into auth_warehouse_bustype
(code, `action`, `name`)
values
<foreach collection="list" item="item" separator=",">
(#{item.code,jdbcType=VARCHAR}, #{item.action,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR})
</foreach>
</insert>
<select id="selectListByCode" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="selectListByCode" parameterType="java.lang.String" resultMap="BaseResultMap">
select auth_warehouse_bustype.id, select auth_warehouse_bustype.id,
@ -172,11 +157,6 @@
</if> </if>
</where> </where>
</select> </select>
<select id="selectById" resultMap="BaseResultMap">
select *
from auth_warehouse_bustype
where id = #{id}
</select>
<select id="selectListByAction" resultMap="BaseResultMap"> <select id="selectListByAction" resultMap="BaseResultMap">
select auth_warehouse_bustype.id, select auth_warehouse_bustype.id,

@ -167,16 +167,6 @@
#{item.id,jdbcType=INTEGER} #{item.id,jdbcType=INTEGER}
</foreach> </foreach>
</update> </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" <insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.auth.WarehouseUserEntity" useGeneratedKeys="true"> parameterType="com.glxp.api.entity.auth.WarehouseUserEntity" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->

@ -2,12 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.basic.BasicBusTypeChangeDao"> <mapper namespace="com.glxp.api.dao.basic.BasicBusTypeChangeDao">
<select id="filterList" resultType="com.glxp.api.res.basic.BasicBusTypeChangeResponse"> <select id="filterList" resultType="com.glxp.api.res.basic.BasicBusTypeChangeResponse">
SELECT SELECT bc.*,
bc.*,
bu.NAME targetName, bu.NAME targetName,
(select originName from basic_bustype_change where originAction = bc.targetBusAction) as targetBusName (select originName
FROM from basic_bustype_change
basic_bustype_change bc where originAction = bc.targetBusAction
limit 1) as targetBusName
FROM basic_bustype_change bc
LEFT JOIN basic_bussiness_type bu ON bc.targetAction = bu.action LEFT JOIN basic_bussiness_type bu ON bc.targetAction = bu.action
<where> <where>
<if test="originAction != null and originAction != ''"> <if test="originAction != null and originAction != ''">
@ -31,7 +32,8 @@
</where> </where>
</select> </select>
<insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity" useGeneratedKeys="true"> <insert id="insertOrUpdateEntity" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.basic.BasicBusTypeChangeEntity" useGeneratedKeys="true">
insert into basic_bustype_change insert into basic_bustype_change
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -96,5 +98,4 @@
busBeforeTime = #{busBeforeTime,jdbcType=TINYINT}, busBeforeTime = #{busBeforeTime,jdbcType=TINYINT},
</trim> </trim>
</insert> </insert>
</mapper> </mapper>

@ -72,11 +72,11 @@
parameterType="com.glxp.api.entity.basic.BasicUnitMaintainEntity"> parameterType="com.glxp.api.entity.basic.BasicUnitMaintainEntity">
REPLACE REPLACE
INTO basic_corp INTO basic_corp
(thirdId,erpId,`name`,spell, (id,thirdId,erpId,`name`,spell,
addr,status,`type`,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, addr,status,`type`,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4,
thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType) thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType,outType)
values values
( (#{id},
#{thirdId}, #{thirdId},
#{erpId}, #{erpId},
#{name}, #{name},

@ -43,7 +43,7 @@
WHERE paramKey = #{paramKey} WHERE paramKey = #{paramKey}
</select> </select>
<update id="updateById" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity"> <update id="updateEntityById" parameterType="com.glxp.api.entity.system.SystemParamConfigEntity">
UPDATE sys_param_config UPDATE sys_param_config
<set> <set>
<if test="paramName != null">paramName=#{paramName},</if> <if test="paramName != null">paramName=#{paramName},</if>

@ -88,6 +88,9 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkCertExpire', 'tinyint', 1
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'preInBackAction', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'backPreinType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'checkPreInOrders', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'checkPreInSpaceCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'checkPreInInvCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'sortNum', 'int', 1); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'sortNum', 'int', 1);
@ -302,9 +305,6 @@ CREATE TABLE IF NOT EXISTS `sync_data_change_bustypes`
ROW_FORMAT = DYNAMIC; ROW_FORMAT = DYNAMIC;
# 修改主键为LONG # 修改主键为LONG
CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('basic_hosp_type', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('basic_udirel', 'id', 'bigint', 2);
@ -337,7 +337,8 @@ CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('auth_space', '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('thr_dept', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_dept', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);

Loading…
Cancel
Save