diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 666cd5ba7..cc1ae5dbe 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -87,6 +87,7 @@ public class AuthUserController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/admin/auth/admin/selectNotSelectUser") public BaseResponse selectNotSelectUser(FilterInvLinkDataRequest filterInvLinkDataRequest) { + filterInvLinkDataRequest.setKey("1"); List warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); List userIds = new ArrayList<>(); warehouseUserEntities.forEach(user -> { diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 48669818f..0ec755607 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -396,8 +396,20 @@ public class InvWarehouseController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List warehouseUserEntities = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); - PageInfo pageInfo = new PageInfo<>(warehouseUserEntities); + filterInvLinkDataRequest.setUserName(filterInvLinkDataRequest.getKey()); + List warehouseUserList = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); + filterInvLinkDataRequest.setUserName(null); + filterInvLinkDataRequest.setEmployeeName(filterInvLinkDataRequest.getKey()); + List warehouseUserList1 = warehouseUserService.getWarehouseUserList(filterInvLinkDataRequest); + PageInfo pageInfo=null; + if(warehouseUserList.size()!=0){ + pageInfo= new PageInfo<>(warehouseUserList); + }else if(warehouseUserList1.size()!=0){ + pageInfo = new PageInfo<>(warehouseUserList1); + }else{ + pageInfo = new PageInfo<>(warehouseUserList); + } + List result = new ArrayList<>(); if (CollUtil.isNotEmpty(pageInfo.getList())) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index dc4d68b39..93d809fa9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -14,6 +14,7 @@ import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.AddOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -119,4 +120,16 @@ public class IoOrderController { } + //未校验单据删除 + @AuthRuleAnnotation("") + @PostMapping("udiwms/inout/order/delete") + public BaseResponse deletById(@RequestBody DeleteRequest deleteRequest) { + orderService.deleteByBillNo(deleteRequest.getBillNo()); + orderDetailBizService.deleteByOrderId(deleteRequest.getBillNo()); + orderDetailCodeService.deleteByOrderId(deleteRequest.getBillNo()); + codeTempService.deleteByBillNo(deleteRequest.getBillNo()); + return ResultVOUtils.success("删除成功！"); + + } + } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index b5c635822..2ae525b16 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -107,7 +107,7 @@ public class ThrDeptController { thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity); } //判断部门是否存在 - + filterThrDeptRequest.setCode(thrDeptEntity.getCode()); filterThrDeptRequest.setName(thrDeptEntity.getName()); filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk()); filterThrDeptRequest.setStatus(thrDeptEntity.getStatus()); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index 99498261a..0996ad1d1 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -69,10 +69,11 @@ public class ThrInvWarehouseController { List ThrInvWarehouseEntityList = new ArrayList<>(); List thrInvWarehouseEntities = thrInvWarehouseService.selectByPid(invSubWarehouseEntity.getParentId()); for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) { - if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) && invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){ + if((invSubWarehouseEntity.getCode().equals(thrInvWarehouseEntity.getCode()) || invSubWarehouseEntity.getName().equals(thrInvWarehouseEntity.getName()))){ //添加集合中 ThrInvWarehouseEntityList.add(thrInvWarehouseEntity); } + } if(ThrInvWarehouseEntityList.size()==0){ invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index a397c59ac..97c6e0abf 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.auth; import com.glxp.api.entity.auth.WarehouseUserEntity; +import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.req.auth.FilterInvUserRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -37,6 +38,7 @@ public interface WarehouseUserDao { List selectListByCode(@Param("code") String code); + List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java index 88eb6ae52..c7be7d40a 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -1,6 +1,6 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; @@ -14,9 +14,9 @@ import java.util.List; * 补单单据类型查询接口 */ @Mapper -public interface BasicBusTypePreDao extends BaseMapper { +public interface BasicBusTypePreDao extends BaseMapperPlus { - List selectList(FilterBusTypeChangeRequest busTypeChangeFilterRequest); + List filterList(FilterBusTypeChangeRequest busTypeChangeFilterRequest); /** * 根据单据类型删除 diff --git a/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java index a622a2de2..933a50f19 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InvProductDetailEntity.java @@ -32,7 +32,7 @@ public class InvProductDetailEntity implements Serializable { * 耗材字典ID */ @TableField(value = "relId") - private String relId; + private Long relId; /** * 最小销售标识 diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java index 632ff3d45..e5f0eb935 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java @@ -10,5 +10,9 @@ import lombok.Data; public class FilterInvLinkDataRequest extends ListPageRequest { private String code; + private String key; + private String userName; + private String employeeName; + } diff --git a/src/main/java/com/glxp/api/req/system/DeleteRequest.java b/src/main/java/com/glxp/api/req/system/DeleteRequest.java index 6952efa37..0076f6a61 100644 --- a/src/main/java/com/glxp/api/req/system/DeleteRequest.java +++ b/src/main/java/com/glxp/api/req/system/DeleteRequest.java @@ -9,4 +9,5 @@ public class DeleteRequest { String id; List ids; + String billNo; } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 848c72563..cd6c646d8 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -8,7 +8,6 @@ import java.util.Date; @Data public class IoOrderResponse { - private Integer id; /** @@ -66,6 +65,16 @@ public class IoOrderResponse { */ private Integer dealStatus; + /** + * -1: "草稿", + * 1: "等待处理", + * 1: "等待处理", + * 2: "等待校验", + * 3: "校验异常", + * 4: "校验成功", + */ + private String checkStatus; + /** * 创建人 */ @@ -166,8 +175,6 @@ public class IoOrderResponse { */ private String reviewUserName; - private static final long serialVersionUID = 1L; - /** * 往来单位名称 */ @@ -179,10 +186,15 @@ public class IoOrderResponse { private String fromInvName; /** - * 部门名称 + * 当前部门名称 */ private String deptName; + /** + * 当前仓库名称 + */ + private String invName; + /** * 往来名称 */ diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index a7bdc0d82..9b00bf59d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -122,9 +122,15 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } if (filterInvLinkDataRequest.getPage() != null) { int offset = (filterInvLinkDataRequest.getPage() - 1) * filterInvLinkDataRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvLinkDataRequest.getLimit()); + if("1".equals(filterInvLinkDataRequest.getKey())){ + + PageHelper.startPage (offset, filterInvLinkDataRequest.getLimit()); + }else{ + PageHelper.offsetPage (offset, filterInvLinkDataRequest.getLimit()); + } + } - return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode()); + return warehouseUserDao.selectListkey(filterInvLinkDataRequest); } @Override diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 395c60135..43c70556a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypePreDao; import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.req.basic.FilterBusTypePreRequest; import com.glxp.api.res.basic.BasicBusTypePreResponse; @@ -33,7 +34,7 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { if (null != busTypeChangeFilterRequest.getPage() && null != busTypeChangeFilterRequest.getLimit()) { PageHelper.offsetPage((busTypeChangeFilterRequest.getPage() - 1) * busTypeChangeFilterRequest.getLimit(), busTypeChangeFilterRequest.getLimit()); } - return basicBusTypePreDao.selectList(busTypeChangeFilterRequest); + return basicBusTypePreDao.filterList(busTypeChangeFilterRequest); } @Override @@ -75,8 +76,8 @@ public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { } @Override - public BasicBusTypePreEntity findByOriginAction(String orginAction) { - return basicBusTypePreDao.selectOne(new QueryWrapper().eq("originAction", orginAction)); + public BasicBusTypePreEntity findByOriginAction(String originAction) { + return basicBusTypePreDao.selectOne(new QueryWrapper().eq("originAction", originAction)); } /** diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index fdb67a498..6927f7aa5 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -131,6 +131,15 @@ public class IoCheckInoutService { }); + //临时表转正式表 + List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); + for (IoCodeTempEntity codeTempEntity : codeTempEntities) { + IoCodeEntity codeEnttity = new IoCodeEntity(); + BeanUtils.copyProperties(codeTempEntity, codeEnttity); + codeService.insert(codeEnttity); + } + codeTempService.deleteByBillNo(orderEntity.getBillNo()); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setUpdateTime(new Date()); orderService.update(orderEntity); @@ -336,6 +345,8 @@ public class IoCheckInoutService { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED); } } + } else { + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_RECEIVEED); } if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_RECEIVEED) { orderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index b3eaa3803..31fcef0cc 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -111,6 +111,7 @@ public class IoGenInvService { for (IoCodeEntity codeEntity : codeEnttities) { InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity(); BeanUtils.copyProperties(codeEntity, invProductDetailEntity); + invProductDetailEntity.setRelId(codeEntity.getRelId()); invProductDetailEntity.setUpdateTime(new Date()); invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON); invProductDetailEntities.add(invProductDetailEntity); @@ -221,6 +222,7 @@ public class IoGenInvService { temps = filterSupMaps.get(corpName); IoOrderEntity outOrder = new IoOrderEntity(); BeanUtils.copyProperties(orderEntity, outOrder); + outOrder.setId(null); outOrder.setSupplementNo(null);//补单需置空 outOrder.setCreateTime(DateUtil.getBeforeDay(DateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime())); outOrder.setAction(targetBustypeEntity.getAction()); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 55dafc587..e2fbf233b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -16,6 +16,8 @@ public interface IoOrderDetailBizService { int deleteById(Integer id); + int deleteByOrderId(String billNo); + boolean isExit(Long relId, String bacthNo, Integer ignoreId); List filterList(FilterOrderDetailBizRequest orderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index 1bfd17f86..ff690d8f2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -32,7 +32,7 @@ public interface IoOrderDetailCodeService { * @param orderId * @return */ - BaseResponse deleteByOrderId(String orderId); + int deleteByOrderId(String orderId); public List checkOrderList(String orderId); } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java index 2d2da9b2e..6daf55720 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -12,6 +12,8 @@ public interface IoOrderDetailResultService { int insert(IoOrderDetailResultEntity orderDetailResultEntity); + int deleteByOrderId(String billNo); + int update(IoOrderDetailResultEntity orderDetailResultEntity); List filterList(FilterOrderDetailResultRequest orderDetailResultRequest); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index ce212bb91..837cc6483 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -23,6 +23,10 @@ public interface IoOrderService { int updateByBillNo(IoOrderEntity orderEntity); + int deleteById(Integer id); + + int deleteByBillNo(String billNo); + /** * 查询单据列表 * diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 5129e2438..e4c96c988 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -42,6 +42,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.deleteById(id); } + @Override + public int deleteByOrderId(String billNo) { + return ioOrderDetailBizDao.delete(new QueryWrapper().eq("orderIdFk", billNo)); + } + @Override public boolean isExit(Long relId, String bacthNo, Integer ignoreId) { diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index d6517f3e3..adb688882 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -58,12 +58,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { } @Override - public BaseResponse deleteByOrderId(String orderId) { - if (StrUtil.isBlank(orderId)) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空！"); - } - ioOrderDetailCodeDao.delete(new QueryWrapper().eq("orderIdFk", orderId)); - return ResultVOUtils.success("删除成功"); + public int deleteByOrderId(String orderId) { + return ioOrderDetailCodeDao.delete(new QueryWrapper().eq("orderIdFk", orderId)); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 91d5d4b02..62f3f4933 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -29,6 +29,11 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic return orderDetailResultDao.insert(orderDetailResultEntity); } + @Override + public int deleteByOrderId(String billNo) { + return orderDetailResultDao.delete(new QueryWrapper().eq("orderIdFk", billNo)); + } + @Override public int update(IoOrderDetailResultEntity orderDetailResultEntity) { return orderDetailResultDao.updateById(orderDetailResultEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index d230b5102..d600c9987 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -60,6 +60,16 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.update(orderEntity, new QueryWrapper().eq("billNo", orderEntity.getBillNo())); } + @Override + public int deleteById(Integer id) { + return orderDao.deleteById(id); + } + + @Override + public int deleteByBillNo(String billNo) { + return orderDao.delete(new QueryWrapper().eq("billNo", billNo)); + } + @Override public List filterList(FilterOrderRequest filterOrderRequest) { if (null == filterOrderRequest) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 97fee7870..c7e9cd220 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index c210b40d7..9687c240d 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -52,7 +52,7 @@ remark) values (#{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{invStorageCode,jdbcType=VARCHAR}, - #{invWarehouseCode,jdbcType=VARCHAR}, #{status,jdbcType=BOOLEAN}, #{createTime,jdbcType=TIMESTAMP}, + #{invWarehouseCode,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}) diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index 80d943931..7d2475fb9 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -252,6 +252,23 @@ where code = #{code} + + + - select basic_bustype_pre.* , - basic_bussiness_type.name + select basic_bustype_pre.*, + basic_bussiness_type.name from basic_bustype_pre - left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action - left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code - left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code + left join basic_bussiness_type on basic_bustype_pre.originAction = basic_bussiness_type.action + left join auth_dept on basic_bustype_pre.defaultDeptCode = auth_dept.code + left join auth_warehouse on basic_bustype_pre.defaultInvCode = auth_warehouse.code where basic_bustype_pre.action = #{action} diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 0e8516e06..313d8e391 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -2,20 +2,20 @@