Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms
| | |
| | | } |
| | | } |
| | | |
| | | if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>() |
| | | .eq(WkOrderItem::getOrderId, order.getId()))) { |
| | | throw new CoolException("原单据明细删除失败!!"); |
| | | } |
| | | if (!this.asnOrderService.removeById(order.getId())) { |
| | | throw new CoolException("原单据删除失败!!"); |
| | | } |
| | | // if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>() |
| | | // .eq(WkOrderItem::getOrderId, order.getId()))) { |
| | | // throw new CoolException("原单据明细删除失败!!"); |
| | | // } |
| | | // if (!this.asnOrderService.removeById(order.getId())) { |
| | | // throw new CoolException("原单据删除失败!!"); |
| | | // } |
| | | } |
| | | } |
| | | } |
| | |
| | | BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>() |
| | | .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type) |
| | | .in(BasStation::getStationName, stationSet) |
| | | .eq(BasStation::getSType, sType) |
| | | // .eq(BasStation::getSType, sType) |
| | | .notIn(!stas.isEmpty(), BasStation::getStationName, stas) |
| | | .last("LIMIT 1")); |
| | | stations.add(basStation); |
| | |
| | | datasource: |
| | | driver-class-name: com.mysql.cj.jdbc.Driver |
| | | username: root |
| | | url: jdbc:mysql://127.0.0.1:3306/rsf-xiri?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai |
| | | url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai |
| | | password: 34821015 |
| | | type: com.alibaba.druid.pool.DruidDataSource |
| | | druid: |