Commit b7cbd956 by 李小惠

调整记账接口,修改现场问题bug

parent 590bb009
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -22,6 +22,7 @@ public class OrgDto {
private Integer delFlag;
private Integer childCount;
private Date updateTime;
private Integer isFlag;
private List<OrgDto> children = new ArrayList<>();
public void addChild(OrgDto child) {
......
......@@ -23,4 +23,5 @@ public class BussinessInventoryReq {
private String endTime;
private String column;
private String order;
private String result;
}
\ No newline at end of file
......@@ -129,6 +129,8 @@ public class LogSummaryReq extends BaseRequest {
private String typeId;
private String sizeId;
private BigDecimal price;
private Integer property;
private String epc;
private String column;
private String order;
......@@ -137,5 +139,6 @@ public class LogSummaryReq extends BaseRequest {
private String endTime;
private String typeName;
private String sizeName;
}
......@@ -20,6 +20,8 @@ public class QueryOrgReq {
private Integer level;
private Integer delFlag;
private String dName;
private Integer isFlag;
}
......@@ -37,6 +37,7 @@ public class UpdateOrgReq {
private String findCode;
@NotNull(message = "组织机构id不能为空",groups = {ValidationApi.edit.class, ValidationApi.detail.class})
private Long orgId;
private Integer isFlag;
}
......
......@@ -24,7 +24,8 @@ public enum EquipmentExceptionEnum implements IExceptionEnum {
/**
* 装备不存在
*/
SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
SIZE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
TYPE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
/**
* 装备名称重复
......@@ -34,6 +35,8 @@ public enum EquipmentExceptionEnum implements IExceptionEnum {
* 装备名称和编号重复
*/
EQUIPMENT_NAME_CODE_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"装备名称重复"),
SUPPLIER_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
;
......
......@@ -28,6 +28,7 @@ public enum PolicemanExceptionEnum implements IExceptionEnum {
*
*/
POLICECODE_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员编号已经存在,警员编号重复"),
POLICENAME_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"警员姓名已经存在,警员姓名重复"),
/**
* 该警员已经绑定账号
......
......@@ -23,6 +23,8 @@ public enum SupplierExceptionEnum implements IExceptionEnum {
SUPPLIER_NAME_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE, "厂商名称已存在"),
SUPPLIER_CODE_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE, "厂商编码已存在"),
SUPPLIER_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
;
......
......@@ -13,6 +13,8 @@ public enum WarehouseExceptionEnum implements IExceptionEnum {
WAREHOUSE_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "仓库信息不存在"),
WAREHOUSE_IS_LOCKED(CommonConstant.DEFAULT_USER_ERROR_CODE , "仓库锁库中,记账失败"),
WAREHOUSE_NAME_IS_EXIET(CommonConstant.DEFAULT_USER_ERROR_CODE , "仓库名称已存在,请勿提交重复名称"),
WAREHOUSE_NAME_NOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE , "{}"),
;
......
......@@ -296,6 +296,7 @@ public class InventoryController {
@PostMapping(path = "/EqsImport",name = "装备导入#logType=30")
@ApiOperation("装备导入")
public ApiRes<Boolean> EqsImport(@RequestBody InventoryReq req){
return ApiRes.success(inventoryService.EqsImport(req));
}
......
......@@ -331,4 +331,10 @@ public class PoliceController {
return ApiRes.success(policemanService.CreateSystemAccount());
}
@PostMapping(path = "/CreateAllUserId",name = "一键生成普通警员账号#logType=30")
@ApiOperation("/一键生成普通警员账号")
public ApiRes<Boolean> CreateAllUserId(){
return ApiRes.success(policemanService.CreateAllUserId());
}
}
......@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.AES;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -21,9 +22,11 @@ import com.junmp.jyzb.cache.OutInRecordRedisCache;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.mapper.PolicemanMapper;
import com.junmp.jyzb.service.*;
import com.junmp.jyzb.utils.DateTimeUtil;
import com.junmp.jyzb.utils.FileUtil;
import com.junmp.v2.auth.api.password.IStoredEncryptApi;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.enums.StatusEnum;
......@@ -45,6 +48,8 @@ import com.junmp.v2.file.biz.entity.SysFileInfo;
import com.junmp.v2.file.biz.service.SysFileInfoService;
import com.junmp.v2.message.api.bean.req.MessageReq;
import com.junmp.v2.message.api.bean.req.MessageSendReq;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.user.entity.SysUser;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.IOUtils;
......@@ -107,6 +112,9 @@ public class PublicController {
@Resource
private OutInRecordRedisCache outInRecordRedisCache;
@Resource
private PolicemanMapper policemanMapper;
private final static String DB_URL_TEMPLATE = "jdbc:mysql://{}:{}/{}?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true";
......@@ -159,6 +167,7 @@ public class PublicController {
@ApiOperation("更新消息")
public ApiRes<Boolean> updateMessage(@RequestBody MessageReq req){
return ApiRes.success(publicService.updateMessage(req));
// return ApiRes.success(true);
}
......@@ -197,6 +206,36 @@ public class PublicController {
return ApiRes.success(pubOrgService.findCodeToOrgId(pubOrg));
}
@PostMapping(path = "/isRedirect",name = "是否需要重定向#logType=30")
@ApiOperation("是否需要重定向")
public ApiRes<Boolean> isRedirect(@RequestBody SysUserReq user){
return ApiRes.success(publicService.isRedirect(user));
}
@PostMapping("/aaaa")
public void aaaa(){
List<Policeman> policemanList=policemanMapper.getAllPolice();
List<Long> userIds=policemanMapper.getUserIds();
List<Long> list = new ArrayList<>();
for (int i=0;i<policemanList.size();i++) {
boolean flag=false;
Random random = new Random();
long rangeStart = 100000000000000000L; // 10^18
long rangeEnd = 999999999999999999L; // 10^19 - 1
Long userId=rangeStart + ((long) (random.nextDouble() * (rangeEnd - rangeStart)));
if (userIds.contains(userId)){
flag=true;
}
if (!flag){
list.add(userId);
}
if (flag){
i--;
}
}
System.out.println("list.toString() = " + list.toString());
}
}
......@@ -222,4 +222,9 @@ public class PubOrg implements Serializable {
@TableField(value = "police_update_time")
private Date policeUpdateTime;
@TableField(value = "is_flag")
private Integer isFlag;
@TableField(exist = false)
private Integer isLastNode;
}
\ No newline at end of file
......@@ -31,6 +31,7 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
List<InventoryMapDto> GetViewInventoryMap(@Param("warehouseId") String warehouseId);
Boolean deleteByEpcs(@Param("list") List<String> epcs);
Boolean deleteByEpcs1(@Param("orgId") Long orgId,@Param("locationId")String locationId);
Boolean DeleteEpcsWithoutWarehouse(@Param("list") List<String> epcs,@Param("orgId") String orgId,@Param("warehouseId") String warehouseId);
......@@ -115,6 +116,8 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
List<Inventory> selectSum(@Param("list") List<Object[]> searchItem,@Param("epcType")Integer epcType);
List<InventoryReq> selectDemo(@Param("typeNameList") List<String> newTypeList, @Param("sizeNameList") List<String> newSizeList);
// IPage<InventoryDto> GetDetailByTerms(@Param("page") Page<Object> defaultPage, @Param("req") InventoryReq req);
......
......@@ -102,4 +102,8 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
void setWarrantyGroupAction();
void updateSummaryInsByOrder(@Param("orgId") Long orgId);
void updateSummaryInsImport(@Param("orgId") Long orgId,@Param("locationId") String locationId);
void deleteByOrgId(@Param("orgId") Long orgId,@Param("locationId") String locationId);
}
\ No newline at end of file
......@@ -35,6 +35,8 @@ public interface LogSummaryMapper extends BaseMapper<LogSummary> {
@Param("pageSize")Long pageSize);
LogSummaryDto RecordSumByOrderIdSum(@Param("req") LogSummaryReq req);
List<LogSummaryReq> selectByOrderCode(@Param("bussinessCode") String bussinessCode);
}
......
......@@ -26,7 +26,7 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
Map<String, Object> getOnePolice(String id);
List<Map<String,Object>> getAllPolice();
List<Policeman> getAllPolice();
List<Map<String, Object>> getAllPolicemanByOrg(String orgId);
......@@ -70,4 +70,8 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
void insertSysUser(@Param("userList") List<SysUser> sysUserList);
String searchUserByRoleId(@Param("orgId") Long orgId);
List<Long> getUserIds();
SysUserReq selectUserById(@Param("userId") Long userId);
}
\ No newline at end of file
......@@ -24,4 +24,8 @@ public interface PubOrgMapper extends BaseMapper<PubOrg> {
List<TjOrgEqsDto> getLowOrg(@Param("orgId") Long orgId);
boolean setAllUserState(@Param("list") List<Long> collect,@Param("delFlag") Integer delFlag);
PubOrg isRedirect(@Param("account") String account);
int selectLastNode(@Param("orgId") Long orgId);
}
\ No newline at end of file
......@@ -12,4 +12,6 @@ import java.util.List;
public interface VieDestroyGroupMapper extends BaseMapper<VieDestoryGroup> {
List<VieDestoryGroup> selectByTerms(@Param("list") List<VieWarrantyGroup> valuesList);
List<VieDestoryGroup> selectSum(@Param("list") List<Object[]> searchItem);
}
\ No newline at end of file
......@@ -17,6 +17,8 @@ import java.util.List;
public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory> {
void updateWareInfo(@Param("list") List<WarehouseInventory> eqsList,@Param("updateTime") Date currentDateTime);
void deleteBylocationId(@Param("orgId") Long orgId,@Param("locationId") String locationId);
}
......
......@@ -45,4 +45,5 @@ public interface BusFormService extends IService<BusForm> {
Object showOrderByBusOrderId(QueryBusFormReq req);
boolean delToSubmitOrder(UpdateBusFormReq req);
}
......@@ -36,6 +36,8 @@ public interface EquipmentSizeService extends IService<EquipmentSize> {
void addSizeInfoToEs();
List<String> checkSizeNameList(List<String> sizeNameList);
//根据typeId拿到装备typeIds
// List<String> selectByTypeIds(List<String> typeIdsList);
......
......@@ -40,4 +40,6 @@ public interface EquipmentTypeService extends IService<EquipmentType> {
String exportSizeAndType(QueryEquipmentTypeReq req);
void addTypeInfoToEs();
List<String> checkTypeList(List<String> typeNameList);
}
......@@ -7,6 +7,7 @@ import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.v2.db.api.page.PageResult;
import liquibase.pro.packaged.S;
import java.util.List;
......@@ -53,4 +54,6 @@ public interface InventorySummaryService extends IService<InventorySummary> {
void setDestoryGroupAction();
void setWarrantyGroupAction();
void updateSummaryInsImport(Long orgId, String warehouseId);
}
......@@ -49,10 +49,11 @@ public interface LogSummaryService extends IService<LogSummary> {
Map<String,LogSummaryReq> setLogSummaryToMap(Map<String,LogSummaryReq> logMap,LoginUser loginUser,
String locationId,String bussinessType,String typeName,String locationName,
String orderId,String orderCode,Long orgId,
String locationState,Integer deviceType);
String locationState,Integer deviceType,Integer subNum);
LogSummaryReq setLogSummary(LoginUser loginUser, String typeName, String locationId, String locationName, Integer subNum,
String orderId, String orderCode, String bussinesstype, Long orgId, String outInState,Integer devideType);
List<LogSummaryReq> selectByOrderCode(String bussinessCode);
}
......@@ -135,4 +135,5 @@ public interface PolicemanService extends IService<Policeman> {
String searchUserByRoleId(Long orgId);
boolean CreateAllUserId();
}
......@@ -5,6 +5,8 @@ import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import com.junmp.v2.dict.api.bean.vo.SimpleDictVo;
import com.junmp.v2.message.api.bean.req.MessageReq;
import com.junmp.v2.message.api.bean.req.MessageSendReq;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.user.entity.SysUser;
import java.util.List;
......@@ -18,4 +20,5 @@ public interface PublicService {
boolean updateMessage(MessageReq req);
boolean isRedirect(SysUserReq user);
}
......@@ -18,4 +18,5 @@ public interface ShelfService extends IService<Shelf> {
List<ShelfDto> GetShelfList(ShelfReq req);
Shelf ShelfExist(String id);
}
......@@ -61,4 +61,6 @@ public interface SupplierService extends IService<Supplier> {
PageResult<Supplier> ShowSupplierPage(QuerySupplierReq req);
List<SupplierInfoDto> alignSupplierInfo(UpdateSupplierReq req);
List<String> checkSupplierList(List<String> supplierNameList);
}
......@@ -2,6 +2,7 @@ package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.TjDto.WarrantyDataDto;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.DetailJsonReq;
import com.junmp.jyzb.api.bean.req.WarrantyReq;
import com.junmp.jyzb.entity.VieDestoryGroup;
import com.junmp.jyzb.entity.VieWarrantyGroup;
......@@ -9,9 +10,14 @@ import com.junmp.v2.db.api.page.PageResult;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface VieDestoryGroupService extends IService<VieDestoryGroup> {
//创建map
Map<String,VieDestoryGroup> createMap(Map<String,VieDestoryGroup> destoryGroupMap, String key, Long orgId,
DetailJsonReq detailJsonReq, String sizeId, String typeId, String orgName);
//更新数据
boolean updateNum(Map<String,VieDestoryGroup> destoryGroupMap);
}
\ No newline at end of file
......@@ -79,4 +79,6 @@ public interface WarehouseService extends IService<Warehouse> {
void HumidityAndtemperatureExport(WarehouseReq req);
Warehouse GetWareHouseInfoByRedis(WarehouseReq req);
List<String> checkWarehouseList(List<String> locationNameList);
}
......@@ -626,11 +626,14 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
}
}
if (!brokenFlag){
VieDestoryGroup vieDestoryGroup = new VieDestoryGroup();
BeanPlusUtil.copyProperties(invSum,vieDestoryGroup);
vieDestoryGroup.setCountOfItems(invSum.getCountOfItems());
vieDestoryGroup.setState("broken");
addList.add(vieDestoryGroup);
if (invSum.getCountOfItems()!=0){
VieDestoryGroup vieDestoryGroup = new VieDestoryGroup();
BeanPlusUtil.copyProperties(invSum,vieDestoryGroup);
vieDestoryGroup.setCountOfItems(invSum.getCountOfItems());
vieDestoryGroup.setState("broken");
addList.add(vieDestoryGroup);
}
}
for (VieWarrantyGroup warrantyInv:warrantyList) {
......
......@@ -998,7 +998,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
// 使用 PageHelper 开始分页
// Page<BussinessInventory> page = PageFactory.getDefaultPage(Long.parseLong(req.getPageNo()),Long.parseLong(req.getPageSize()));
Page<BussinessInventory> page = this.page(PageFactory.getDefaultPage(), wrapper);
Page<BussinessInventory> page = this.page(PageFactory.getDefaultPage(Long.valueOf(req.getPageNo()),Long.valueOf(req.getPageSize())), wrapper);
return PageResultFactory.createPageResult(page);
......@@ -1047,6 +1047,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
return wrapper;
}
wrapper.eq(BussinessInventory::getOrgId, req.getOrgId());
wrapper.eq(ObjectUtil.isNotNull(req.getResult())&& !req.getResult().equals("all") ,BussinessInventory::getResult,req.getResult());
wrapper.eq(StringUtils.isNotBlank(req.getWarehouseId()), BussinessInventory::getWarehouseId, req.getWarehouseId());
wrapper.eq(StringUtils.isNotBlank(req.getInventoryState()), BussinessInventory::getInventoryState, req.getInventoryState());
if (StringUtils.isNotBlank(req.getExamineState())) {
......
package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
......@@ -257,6 +258,27 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
sizeRepository.saveAll(list);
}
@Override
public List<String> checkSizeNameList(List<String> sizeNameList) {
LambdaQueryWrapper<EquipmentSize> sizeEq=new LambdaQueryWrapper<>();
sizeEq.in(CollectionUtil.isNotEmpty(sizeNameList),EquipmentSize::getName,sizeNameList);
List<EquipmentSize> equipmentSizeList = list(sizeEq);
List<String> noneExitentSizes=new ArrayList<>();
for (String sizeName:sizeNameList) {
boolean flag=false;
for (EquipmentSize size:equipmentSizeList) {
if (size.getName().equals(sizeName)){
flag=true;
break;
}
}
if (!flag){
noneExitentSizes.add(sizeName);
}
}
return noneExitentSizes;
}
public List<String> selectByTypeIds(List<String> typeIdsList){
List<String> list1=new ArrayList<>();
......
......@@ -648,6 +648,28 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
typeRepository.saveAll(list);
}
@Override
public List<String> checkTypeList(List<String> typeNameList) {
LambdaQueryWrapper<EquipmentType> typeEq=new LambdaQueryWrapper<>();
typeEq.in(CollectionUtil.isNotEmpty(typeNameList),EquipmentType::getName,typeNameList);
List<EquipmentType> equipmentTypeList = list(typeEq);
List<String> noneExitentTypes=new ArrayList<>();
for (String typeName:typeNameList) {
boolean flag=false;
for (EquipmentType type:equipmentTypeList) {
if (type.getName().equals(typeName)){
flag=true;
break;
}
}
if (!flag){
noneExitentTypes.add(typeName);
}
}
return noneExitentTypes;
}
}
......
......@@ -520,4 +520,9 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
System.out.println("111 = " + 333);
}
@Override
public void updateSummaryInsImport(Long orgId,String locationId) {
inventorySummaryMapper.updateSummaryInsImport(orgId,locationId);
}
}
......@@ -232,7 +232,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
b=orderDetailService.updateBatchById(detailList);
//2.判断业务类型,如果是采购,更新装备库存表
if (order.getBussinessType().equals("purchase")){
if (order.getBussinessType().equals("purchase") ||order.getBussinessType().equals("gift")){
List<PurchaseEqsReq> purchaseList = order.getPurchaseList();
List<Inventory> collect1=new ArrayList<>();
List<WarehouseInventory> warehouseInventoryList=new ArrayList<>();
......@@ -252,6 +252,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
warehouseInventory.setLocationType("0");
warehouseInventory.setOrgId(order.getOrgId());
warehouseInventory.setFlag(0);
warehouseInventory.setEpcType(0);
warehouseInventory.setCreateTime(DateTimeUtil.getCurrentDateTime());
warehouseInventory.setUpdateTime(DateTimeUtil.getCurrentDateTime());
warehouseInventoryList.add(warehouseInventory);
......@@ -259,6 +260,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
inventory.setEpc(eqsReq.getEpc());
inventory.setTypeId(eqsReq.getTypeId());
inventory.setSizeId(eqsReq.getSizeId());
inventory.setEpcType(0);
inventory.setMaintenancePeriod(eqsReq.getMaintenancePeriod());
inventory.setWarrantyPeriod(eqsReq.getWarrantyPeriod());
inventory.setProperty(eqsReq.getProperty());
......@@ -539,7 +541,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
SysFileInfoReq sysFileInfoReq = new SysFileInfoReq();
sysFileInfoReq.setFileBucket("jyzb");
sysFileInfoReq.setFileLocation(3);
sysFileInfoReq.setFileObjectName("OutInPrice/"+logreq.getOrgId()+"/");
sysFileInfoReq.setFileObjectName("OutInPhoto/"+logreq.getOrgId()+"/");
SysFileInfoResp sysFileInfoResp = sysFileInfoService.uploadFile(picture, sysFileInfoReq);
logreq.setPicture(sysFileInfoResp.getAccessUrl());
}
......@@ -591,7 +593,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
//将所有装备信息进行存放(为后面计算汇总信息)
//判断logSummary是否为采购,快速移库,和领用出库
//如果是采购则不处理,因为采购的inventory是跟着单子来处理的,其他的单子直接根据出入库记录来处理
if (!logreq.getBussinessType().equals("purchase") && !logreq.getBussinessType().equals("quick") ){
if (!logreq.getBussinessType().equals("purchase") && !logreq.getBussinessType().equals("gift") && !logreq.getBussinessType().equals("quick") ){
// if (logreq.getOutInState().equals("in")){
Inventory inventory = saveInventory(logreq.getOrgId(),logreq.getLocationId(),logreq,detailLogReq, map, logSummary.getOutInState());
inventoryList.add(inventory);
......@@ -666,7 +668,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
LambdaUpdateWrapper<Inventory> allocateInWrapper1 = Wrappers.lambdaUpdate();
LambdaUpdateWrapper<WarehouseInventory> updateStateWrapper2 = Wrappers.lambdaUpdate();
LambdaUpdateWrapper<WarehouseInventory> allocateInWrapper2 = Wrappers.lambdaUpdate();
LambdaQueryWrapper<WarehouseInventory> destroyOutWrapper =Wrappers.lambdaQuery();
LambdaUpdateWrapper<WarehouseInventory> destroyOutWrapper =Wrappers.lambdaUpdate();
for (Inventory inventory:inventoryList) {
if (inventory.getBussinessType().equals("allocate") && inventory.getLocationState().equals("in") && !ObjectUtil.isNull(ordermain)){
//调拨入库
......@@ -695,30 +697,27 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
.set(Inventory::getBussinessState,"destruction")
.set(Inventory::getLocationId,inventory.getLocationId())
.set(Inventory::getState,"destory");
destroyOutWrapper.or().eq(WarehouseInventory::getEpc,inventory.getEpc());
}else{
//其他情况
if (inventory.getBussinessType().equals("quick")){
updateStateWrapper1.or().eq(Inventory::getEpc,inventory.getEpc())
.set(Inventory::getLocationState,"in")
.set(Inventory::getBussinessState,"normal")
.set(Inventory::getLocationId,inventory.getLocationId())
.set(Inventory::getState,"normal");
updateStateWrapper2.or().eq(WarehouseInventory::getEpc,inventory.getEpc())
.set(WarehouseInventory::getLocationId,inventory.getLocationId())
.set(WarehouseInventory::getLocationState,"in");
}else {
updateStateWrapper1.or().eq(Inventory::getEpc,inventory.getEpc())
.set(Inventory::getLocationState,inventory.getLocationState())
.set(Inventory::getBussinessState,inventory.getBussinessState())
.set(Inventory::getState,inventory.getState());
updateStateWrapper2.or().eq(WarehouseInventory::getEpc,inventory.getEpc())
.set(WarehouseInventory::getLocationState,"out");
}else if (inventory.getBussinessType().equals("quick")){
updateStateWrapper1.or().eq(Inventory::getEpc,inventory.getEpc())
.set(Inventory::getLocationState,"in")
.set(Inventory::getBussinessState,"normal")
.set(Inventory::getLocationId,inventory.getLocationId())
.set(Inventory::getState,"normal");
updateStateWrapper2.or().eq(WarehouseInventory::getEpc,inventory.getEpc())
.set(WarehouseInventory::getLocationState,inventory.getLocationState());
updateStateWrapper2.or().eq(WarehouseInventory::getEpc,inventory.getEpc())
.set(WarehouseInventory::getLocationId,inventory.getLocationId())
.set(WarehouseInventory::getLocationState,"in");
}
}else {
updateStateWrapper1.or().eq(Inventory::getEpc,inventory.getEpc())
.set(Inventory::getLocationState,inventory.getLocationState())
.set(Inventory::getBussinessState,inventory.getBussinessState())
.set(Inventory::getState,inventory.getState());
updateStateWrapper2.or().eq(WarehouseInventory::getEpc,inventory.getEpc())
.set(WarehouseInventory::getLocationState,inventory.getLocationState());
}
......@@ -769,7 +768,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
for (InventoryReq inv:list) {
logMap=setLogSummaryToMap(logMap,loginUser,inv.getLocationId(),bussinessType,inv.getTypeName(),
inv.getLocationName(),orderId,orderCode,inv.getOrgId(),inv.getLocationState(),deviceType);
inv.getLocationName(),orderId,orderCode,inv.getOrgId(),inv.getLocationState(),deviceType,1);
}
logMap = setLogDetailToMap(list, logMap, bussinessType);
......@@ -796,7 +795,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
public Map<String, LogSummaryReq> setLogSummaryToMap(Map<String,LogSummaryReq> logMap,LoginUser loginUser,
String locationId,String bussinessType,String typeName,String locationName,
String orderId,String orderCode,Long orgId,
String locationState,Integer deviceType) {
String locationState,Integer deviceType,Integer sumNum) {
if (logMap.containsKey(locationId)){
LogSummaryReq logSummaryReq = logMap.get(locationId);
logSummaryReq.setNumber(logSummaryReq.getNumber()+1);
......@@ -805,7 +804,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
logMap.put(locationId,logSummaryReq);
}else {
LogSummaryReq logSummaryReq = setLogSummary(loginUser,typeName,locationId,locationName,
1,orderId,orderCode,bussinessType,orgId,locationState,deviceType);
sumNum,orderId,orderCode,bussinessType,orgId,locationState,deviceType);
logMap.put(locationId,logSummaryReq);
}
return logMap;
......@@ -907,6 +906,12 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
return logSummaryReq;
}
@Override
public List<LogSummaryReq> selectByOrderCode(String bussinessCode) {
return logSummaryMapper.selectByOrderCode(bussinessCode);
}
}
......
......@@ -640,7 +640,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
public OrgDto getMaximumParent(List<OrgDto> orgs, OrgDto org) {
OrgDto dept = null;
String parentId = org.getOrgParentId().toString();
if(parentId.equals("-1")){
if(parentId.equals("0")){
dept = org;
}else {
List<OrgDto> parent = orgs.stream().filter(item -> item.getOrgId().toString().equals( parentId)).collect(Collectors.toList());
......@@ -861,6 +861,8 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
if (ObjectUtil.isNotNull(req.getOrgId())){
pubOrg = PubOrgExist(req.getOrgId());
int isLastNode=pubOrgMapper.selectLastNode(req.getOrgId());
pubOrg.setIsLastNode(isLastNode);
}
if (ObjectUtil.isNotNull(req.getOrgCode())){
pubOrg = getOne(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getOrgCode, req.getOrgCode()));
......@@ -871,6 +873,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
@Override
public Long findCodeToOrgId(PubOrg pubOrg) {
PubOrg one = getOne(new LambdaQueryWrapper<PubOrg>()
.isNotNull(PubOrg::getLevelFlag)
.eq(PubOrg::getFindCode, pubOrg.getFindCode())
.or()
.eq(PubOrg::getOrgCode, pubOrg.getFindCode())
......
......@@ -2,17 +2,21 @@ package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.junmp.junmpProcess.dto.json.UserInfo;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.mapper.PubOrgMapper;
import com.junmp.jyzb.service.PublicService;
import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.enums.StatusEnum;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.entity.BaseEntity;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import com.junmp.v2.dict.api.bean.vo.SimpleDictVo;
......@@ -28,9 +32,14 @@ import com.junmp.v2.message.api.bean.req.MessageSendReq;
import com.junmp.v2.message.api.enums.MsgReadStateEnum;
import com.junmp.v2.message.db.entity.SysMessage;
import com.junmp.v2.message.db.service.SysMessageService;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.user.entity.SysUser;
import com.junmp.v2.sys.user.service.SysUserOrgService;
import com.junmp.v2.sys.user.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
import java.util.ArrayList;
......@@ -51,6 +60,12 @@ public class PublicServiceImpl implements PublicService {
@Resource
private MessageApi messageApi;
@Resource
private SysUserService sysUserService;
@Resource
private PubOrgMapper pubOrgMapper;
@Resource
private SysMessageService sysMessageService;
......@@ -100,7 +115,7 @@ public class PublicServiceImpl implements PublicService {
//将该条消息全设置为已读并且更新再推送一条消息
sysMessageService.update(new LambdaUpdateWrapper<SysMessage>()
.set(SysMessage::getReadFlag,1)
.set(SysMessage::getReadFlag,1).set(BaseEntity::getUpdateUser, 123456)
.eq(SysMessage::getBizId,req.getBizId()));
List<SysMessage> list = sysMessageService.list(new LambdaQueryWrapper<SysMessage>().eq(SysMessage::getBizId, req.getBizId()));
List<Long> userIdList = list.stream().map(SysMessage::getReceiveUserId).collect(Collectors.toList());
......@@ -119,6 +134,22 @@ public class PublicServiceImpl implements PublicService {
return true;
}
//是否需要重定向
@Override
public boolean isRedirect(SysUserReq user) {
//如果该用户不存在,返回false
List<SysUser> list = sysUserService.list(new LambdaQueryWrapper<SysUser>().eq(SysUser::getAccount, user.getAccount()));
if (CollectionUtil.isEmpty(list)){
return false;
}
//如果存在,判断该账号所属组织机构是否使用3.0需要,组织机构表中中的字段值是否为1,是1,则直接返回true,否则直接返回false
PubOrg pubOrg=pubOrgMapper.isRedirect(user.getAccount());
if (ObjectUtil.isNull(pubOrg)){
return false;
}else {
return pubOrg.getIsFlag()==1;
}
}
}
package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
......@@ -95,4 +96,5 @@ public class ShelfServiceImpl extends ServiceImpl<ShelfMapper, Shelf> implements
return shelf;
}
}
......@@ -184,6 +184,27 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
}
@Override
public List<String> checkSupplierList(List<String> supplierNameList) {
LambdaQueryWrapper<Supplier> supplierEq=new LambdaQueryWrapper<>();
supplierEq.in(CollectionUtil.isNotEmpty(supplierNameList),Supplier::getName,supplierNameList);
List<Supplier> supplierList = list(supplierEq);
List<String> noneExitentSuppliers=new ArrayList<>();
for (String supplierName:supplierNameList) {
boolean flag=false;
for (Supplier supplier:supplierList) {
if (supplier.getName().equals(supplierName)){
flag=true;
break;
}
}
if (!flag){
noneExitentSuppliers.add(supplierName);
}
}
return noneExitentSuppliers;
}
@Override
public Boolean ChangeSupplierState(UpdateSupplierReq req) {
Supplier supplier = this.getById(req.getId());
if (ObjectUtil.isNull(supplier)) {
......
package com.junmp.jyzb.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.DetailJsonReq;
import com.junmp.jyzb.entity.VieDestoryGroup;
import com.junmp.jyzb.entity.VieWarrantyGroup;
import com.junmp.jyzb.mapper.VieDestroyGroupMapper;
import com.junmp.jyzb.mapper.VieWarrantyGroupMapper;
import com.junmp.jyzb.service.VieDestoryGroupService;
import com.junmp.jyzb.service.VieWarrantyGroupService;
import jdk.nashorn.internal.ir.annotations.Reference;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Service
@Slf4j
public class VieDestoryGroupServiceImpl extends ServiceImpl<VieDestroyGroupMapper, VieDestoryGroup> implements VieDestoryGroupService {
@Resource
private VieDestroyGroupMapper vieDestroyGroupMapper;
//生成map
@Override
public Map<String, VieDestoryGroup> createMap(Map<String,VieDestoryGroup> destoryGroupMap, String key,Long orgId,
DetailJsonReq detailJsonReq, String sizeId, String typeId, String orgName) {
if (destoryGroupMap.containsKey(key)) {
VieDestoryGroup vieDestoryGroup = destoryGroupMap.get(key);
vieDestoryGroup.setCountOfItems(vieDestoryGroup.getCountOfItems()+detailJsonReq.getModifyQuantity());
destoryGroupMap.put(key,vieDestoryGroup);
}else {
VieDestoryGroup vieDestoryGroup = new VieDestoryGroup();
vieDestoryGroup.setCountOfItems(detailJsonReq.getModifyQuantity());
vieDestoryGroup.setState("destory");
vieDestoryGroup.setSizeId(sizeId);
vieDestoryGroup.setSizeName(detailJsonReq.getSizeName());
vieDestoryGroup.setTypeId(typeId);
vieDestoryGroup.setTypeName(detailJsonReq.getTypeName());
vieDestoryGroup.setOrgId(orgId.toString());
vieDestoryGroup.setOrgName(orgName);
vieDestoryGroup.setWarehouseId(detailJsonReq.getLocationId());
vieDestoryGroup.setWarehouseName(detailJsonReq.getLocationName());
destoryGroupMap.put(key,vieDestoryGroup);
}
return destoryGroupMap;
}
//更新表中数据
@Override
@Transactional
public boolean updateNum(Map<String,VieDestoryGroup> destoryGroupMap) {
List<Object[]> searchItem=new ArrayList<>();
for (VieDestoryGroup vieDestoryGroup:destoryGroupMap.values()) {
Object[] item=new Object[]{vieDestoryGroup.getOrgId(),vieDestoryGroup.getWarehouseId(),
vieDestoryGroup.getTypeId(),vieDestoryGroup.getSizeId()};
searchItem.add(item);
}
List<VieDestoryGroup> vieDestoryGroupList= vieDestroyGroupMapper.selectSum(searchItem);
List<VieDestoryGroup> addList=new ArrayList<>();
for (VieDestoryGroup vie:destoryGroupMap.values()) {
boolean flag=false;
for (VieDestoryGroup destoryGroup:vieDestoryGroupList) {
if (vie.getWarehouseId().equals(destoryGroup.getWarehouseId())
&& vie.getTypeId().equals(destoryGroup.getTypeId())
&& vie.getSizeId().equals(destoryGroup.getSizeId()) ){
destoryGroup.setCountOfItems(destoryGroup.getCountOfItems()+vie.getCountOfItems());
flag=true;
break;
}
}
if (!flag){
VieDestoryGroup vieDestoryGroup = new VieDestoryGroup();
vieDestoryGroup.setOrgId(vie.getOrgId());
vieDestoryGroup.setOrgName(vie.getOrgName());
vieDestoryGroup.setTypeId(vie.getTypeId());
vieDestoryGroup.setTypeName(vie.getTypeName());
vieDestoryGroup.setSizeId(vie.getSizeId());
vieDestoryGroup.setSizeName(vie.getSizeName());
vieDestoryGroup.setWarehouseId(vie.getWarehouseId());
vieDestoryGroup.setWarehouseName(vie.getWarehouseName());
vieDestoryGroup.setCountOfItems(vie.getCountOfItems());
vieDestoryGroup.setState("destory");
addList.add(vieDestoryGroup);
}
}
updateBatchById(vieDestoryGroupList);
if (CollectionUtil.isNotEmpty(addList)){
saveBatch(addList);
}
return true;
}
}
......@@ -398,5 +398,25 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
return getById(req.getId());
}
public List<String> checkWarehouseList(List<String> locationNameList) {
LambdaQueryWrapper<Warehouse> warehosueEq=new LambdaQueryWrapper<>();
warehosueEq.in(CollectionUtil.isNotEmpty(locationNameList),Warehouse::getName,locationNameList);
List<Warehouse> locationList = list(warehosueEq);
List<String> noneExitentLocations=new ArrayList<>();
for (String locationName:locationNameList) {
boolean flag=false;
for (Warehouse location:locationList) {
if (location.getName().equals(locationName)){
flag=true;
break;
}
}
if (!flag){
noneExitentLocations.add(locationName);
}
}
return noneExitentLocations;
}
}
......@@ -202,10 +202,10 @@
SUM(t.fix_count) AS fix_count,
SUM(t.broken_count) AS broken_count,
sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number,
(SELECT `org_id` FROM `pub_org` WHERE `org_id` = 1369509498032811869 OR `org_parent_ids` LIKE CONCAT('%', 1369509498032811869, '%') ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE `org_id` = 1369509498032811869 OR `org_parent_ids` LIKE CONCAT('%', 1369509498032811869, '%') ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE `org_id` = 1369509498032811869 OR `org_parent_ids` LIKE CONCAT('%', 1369509498032811869, '%') ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE `org_id` = 1369509498032811869 OR `org_parent_ids` LIKE CONCAT('%', 1369509498032811869, '%') ORDER BY `level_flag` LIMIT 1) AS d_name
(SELECT `org_id` FROM `pub_org` WHERE ( `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE ( `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%'))and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%'))and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%'))and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS d_name
FROM (
SELECT
vecs.`year`,
......@@ -427,7 +427,7 @@
sum(vecs.number) as number
FROM vie_equipment_count_summary vecs
left join pub_org po on vecs.org_id_int=po.org_id
where vecs.`year`= 2024 and po.del_flag=1
where vecs.`year`= #{year} and po.del_flag=1
<if test="level ==null" >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
......
......@@ -42,7 +42,7 @@
base_inventory i
set
i.size_id=(select DISTINCT id FROM base_equipment_size where name = #{item.sizeName} and
i.type_id =(select DISTINCT id FROM base_equipment_type where name = #{item.typeName} limit 1) limit 1),
type_id =(select DISTINCT id FROM base_equipment_type where name = #{item.typeName} limit 1) limit 1),
i.type_id=(select DISTINCT id FROM base_equipment_type where name = #{item.typeName} limit 1),
i.location_id=(select DISTINCT id FROM base_warehouse where name = #{item.locationName} limit 1),
i.state="normal",i.bussiness_state="normal",i.update_time=#{updateTime},i.property=0,i.epc_type=1,i.location_state="in",
......@@ -117,9 +117,16 @@
DELETE FROM base_inventory
WHERE epc IN
<foreach item="item" index="index" collection="list"
open="(" separator="," close=")">
#{item}
</foreach>
open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<delete id="deleteByEpcs1" parameterType="java.util.List">
DELETE FROM base_inventory
WHERE epc IN
(select a.epc FROM (select epc FROM base_inventory where org_id_int=#{orgId} )as a
join (select epc FROM base_warehouse_inventory where org_id=#{orgId} and location_id=#{locationId})
as b on a.epc=b.epc)
</delete>
<delete id="DeleteEpcsWithoutWarehouse" parameterType="java.util.List">
......@@ -134,6 +141,7 @@
AND bwi.location_id != #{warehouseId}
</delete>
<select id="selectWarehouseByEpcs" resultType="com.junmp.jyzb.api.bean.dto.InvSummaryDto">
SELECT
bi.type_id as typeId,
......@@ -648,18 +656,19 @@
SELECT
t1.type_id,
t1.size_id,
t1.epc,
t1.location_id,
t2.supplier_id,
t2.state,
t2.bussiness_state,
t2.production_date,
t2.warranty_period,
t2.maintenance_period,
t2.price,
t2.property,
t1.type_id as type_id,
t1.size_id as size_id,
t1.epc as epc,
t1.location_id as location_id,
t2.supplier_id as supplierId,
t2.state as state,
t2.bussiness_state as bussiness_state,
t2.production_date as production_date,
t2.warranty_period as warranty_period,
t2.maintenance_period as maintenance_period,
t2.price as price,
t2.property as property,
t2.equ_state as equ_state,
es.NAME AS size_name,
et.NAME AS type_name,
bs.NAME AS supplier_name,
......@@ -674,7 +683,7 @@
FROM
`base_warehouse_inventory` wi
WHERE
wi.org_id = #{orgId} and wi.epc_type=0
wi.org_id = #{orgId}
<if test="warehouseId!= null and warehouseId != ''">
and wi.location_id=#{warehouseId}
</if>
......@@ -707,7 +716,7 @@
i.property,
i.state AS equ_state
FROM
base_inventory i and wi.epc_type=0 and i.org_id = #{orgId} and i.state!="destory"
base_inventory i where i.org_id_int = #{orgId}
) AS t2 ON t2.epc = t1.epc
left JOIN base_equipment_size es ON t1.size_id = es.id
left JOIN base_equipment_type et ON t1.type_id = et.id
......@@ -828,7 +837,7 @@
</select>
<select id="getEqsInfo" resultType="com.junmp.jyzb.entity.Inventory">
SELECT wi.id as wiId,wi.type_id,wi.size_id,wi.shelf_id,wi.shelf_location, wi.epc,wi.org_id,wi.location_state,
SELECT wi.id as wi_id,wi.type_id,wi.size_id,wi.shelf_id,wi.shelf_location, wi.epc,wi.org_id,wi.location_state,
wi.type_name,wi.org_name,wi.size_name,wi.location_name,
wi.location_type,wi.location_id,i.id ,i.price,i.state,i.bussiness_state,
i.production_date,i.warranty_period,i.maintenance_period, i.term_state
......@@ -844,6 +853,30 @@
and i.production_date >= #{startTime} and i.production_date &lt; #{endTime}
ORDER BY wi.epc_type desc
</select>
<select id="selectDemo" resultType="com.junmp.jyzb.api.bean.query.InventoryReq">
SELECT
*
FROM
(
SELECT
s1.id AS type_id,
s1.NAME AS type_name,
s2.id AS size_id,
s2.NAME AS size_name
FROM
base_equipment_type s1
LEFT JOIN base_equipment_size s2 ON s1.id = s2.type_id
) s
where s.type_name in
<foreach collection="typeNameList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and s.size_name in
<foreach collection="sizeNameList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
</mapper>
\ No newline at end of file
......@@ -88,9 +88,10 @@
WHERE add_price IS NULL OR add_num IS NULL;
</update>
<insert id="updateSummaryInsByOrder" statementType="CALLABLE">
{CALL UpdateInventorySummaryByOrgId(#{orgId, mode=IN})}
</insert>
<insert id="setWarrantyInventoryAction" statementType="CALLABLE">
......@@ -397,6 +398,9 @@
#{item.id}
</foreach>
</delete>
<delete id="deleteByOrgId">
delete from base_inventory_summary where org_id_int=#{orgId} and location_id =#{locationId}
</delete>
<insert id="getSumByWarehouse" >
......@@ -463,6 +467,57 @@
<insert id="useViewOrgIdInLevel">
{CALL view_orgIdInLevel(#{sql,mode=IN},#{orgId,mode=IN})}
</insert>
<insert id="updateSummaryInsImport">
INSERT INTO base_inventory_summary (valuekey, org_id_int,property, org_name, org_code, type_id, type_name, size_id, size_name,
location_type, location_id, location_name, number, unit_price,
price, stock_number, outbound_number, destruction_number, expire_number, broken_number, fix_number, use_number)
select
CONCAT(
COALESCE(t.org_code, "--0000"),
COALESCE(t.location_id, "--0000"),
COALESCE(t.type_id, "--0000"),
COALESCE(t.size_id, "--0000"),
COALESCE(t.unit_price, "--0000"),
COALESCE(t.property, "--00")
) as valuekey,
t.org_id_int,t.property,t.org_name,t.org_code,t.type_id,t.type_name,t.size_id,t.size_name,t.location_type,t.location_id,max(t.location_name) as location_name,sum(t.number) as number,
t.unit_price,sum(t.price)as price,sum(t.stock_number)as stock_number,sum(t.outbound_number)as outbound_number,
sum(t.destruction_number)as destruction_number,sum(t.expire_number)as expire_number,sum(t.broken_number)as broken_number,sum(t.fix_number)as fix_number,sum(t.use_number)as use_number FROM (
SELECT
bi.org_id_int as org_id_int,
COALESCE(bi.property, 0) as property,
po.org_name as org_name,
po.org_code as org_code,
bi.type_id as type_id,
t.name as type_name,
bi.size_id as size_id,
s.name as size_name,
COALESCE(bcb.cabinet_id, bw.id) as location_id,
COALESCE(MAX(bc.name), MAX(bw.name)) as location_name,
bi.location_type as location_type,
SUM(CASE WHEN location_state = "in" THEN 1 ELSE 0 END) + SUM(CASE WHEN location_state ="out" and bi.state != "destory" THEN 1 ELSE 0 END) as number,
bi.price as unit_price,
sum(case when location_state = "out" and bi.state = "destory" THEN 0 ELSE bi.price END) as price,
SUM(CASE WHEN location_state = "in" THEN 1 ELSE 0 END) AS stock_number,
SUM(CASE WHEN location_state = "out" and bi.state != "destory" THEN 1 ELSE 0 END) AS outbound_number,
sum(case when bi.state = "destory" then 1 else 0 end) as destruction_number,
sum(case when bi.warranty_period = 0 then 0 when DATE_ADD(bi.production_date, INTERVAL bi.warranty_period MONTH) &lt; NOW() and location_state="in" then 1 else 0 end) as expire_number,
sum(case when bi.state = "broken" and bi.location_state = "in" then 1 else 0 end) as broken_number,
sum(case when bi.state = "repair" and bi.location_state = "out" then 1 else 0 end) as fix_number,
sum(case when bi.bussiness_state ="use" and bi.location_state = "out" then 1 else 0 end) as use_number
FROM base_inventory bi
LEFT JOIN base_cabinet_box bcb ON bi.location_id = bcb.id and bi.location_type=1
LEFT JOIN base_cabinet bc ON bcb.cabinet_id = bc.id
LEFT JOIN base_warehouse bw ON bi.location_id = bw.id AND bi.location_type = 0
JOIN base_equipment_type t ON t.id = bi.type_id
JOIN base_equipment_size s ON s.id = bi.size_id
JOIN pub_org po ON bi.org_id_int = po.org_id
and po.org_id=#{orgId}
where bi.location_id=#{locationId}
GROUP BY bi.org_id_int, location_id, type_id, size_id, bi.price, bi.location_type,bi.property
ORDER BY org_id_int, location_id) as t
GROUP BY t.org_id_int,t.location_id,t.type_id,t.size_id,t.location_type,t.unit_price,t.property
</insert>
<select id="getTotalData" parameterType="java.lang.String" resultType="java.lang.String">
SELECT
......@@ -762,6 +817,9 @@
<if test="req.column != null and req.column != '' and req.order != null and req.order != '' ">
order by ${req.column} ${req.order}
</if>
<if test="req.column == null">
order by size_name
</if>
</select>
<select id="selectSumByItemsCount" resultType="java.lang.Integer"
parameterType="com.junmp.jyzb.api.bean.query.InventoryReq">
......
......@@ -63,6 +63,7 @@
select ld.*,ls.location_name,ls.user_name FROM base_log_detail ld
join base_log_summary ls on ls.id=ld.summary_id
where epc=#{epc}
order by ld.create_time desc
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize}
</if>
......
......@@ -214,6 +214,14 @@
GROUP BY order_main_id,bussiness_type,out_in_state
) as a
</select>
<select id="selectByOrderCode" resultType="com.junmp.jyzb.api.bean.query.LogSummaryReq">
select a.*,ld.epc,ld.type_id,ld.type_name,ld.size_id,ld.size_name,ld.price,ld.property from(
select id,org_id,org_name,order_code,location_id,location_name,bussiness_type,out_in_state
from base_log_summary where order_code=#{bussinessCode}
) as a
left join base_log_detail ld on a.id=ld.summary_id
order by epc
</select>
</mapper>
......@@ -65,28 +65,28 @@
WHERE p.id = #{id};
</select>
<select id="getAllPolice" resultType="Map">
SELECT
p.id AS id,
o.org_id AS orgId,
o.org_name AS orgName,
p.name AS name,
p.sex,
p.phone,
p.photo,
p.police_code AS policeCode,
c.id AS cabinetId,
c.name AS cabinetName,
p.update_time AS updateTime
<!-- GROUP_CONCAT(JSON_OBJECT('fingerId', f.id, 'fingerName', f.name,'fingerInfo', f.finger_info)) AS fingerMsg-->
<!-- GROUP_CONCAT(JSON_OBJECT('fingerId', f.id, 'fingerName', f.name,'fingerInfo', f.finger_info)) AS fingerMsg-->
FROM base_policeman p
left JOIN pub_org o ON p.org_id_int = o.org_id
left JOIN base_cabinet c ON p.cabinet_box_id = c.id
<!-- LEFT JOIN base_police_finger f ON f.police_id = p.id-->
<!-- GROUP BY p.id, o.org_id, o.org_name, p.name, p.sex, p.phone, p.photo, p.police_code, c.id, c.name, p.update_time-->
<!--<select id="getAllPolice" resultType="Map">-->
<!-- SELECT-->
<!-- p.id AS id,-->
<!-- o.org_id AS orgId,-->
<!-- o.org_name AS orgName,-->
<!-- p.name AS name,-->
<!-- p.sex,-->
<!-- p.phone,-->
<!-- p.photo,-->
<!-- p.police_code AS policeCode,-->
<!-- c.id AS cabinetId,-->
<!-- c.name AS cabinetName,-->
<!-- p.update_time AS updateTime-->
<!--&lt;!&ndash; GROUP_CONCAT(JSON_OBJECT('fingerId', f.id, 'fingerName', f.name,'fingerInfo', f.finger_info)) AS fingerMsg&ndash;&gt;-->
<!--&lt;!&ndash; GROUP_CONCAT(JSON_OBJECT('fingerId', f.id, 'fingerName', f.name,'fingerInfo', f.finger_info)) AS fingerMsg&ndash;&gt;-->
<!-- FROM base_policeman p-->
<!-- left JOIN pub_org o ON p.org_id_int = o.org_id-->
<!-- left JOIN base_cabinet c ON p.cabinet_box_id = c.id-->
<!--&lt;!&ndash; LEFT JOIN base_police_finger f ON f.police_id = p.id&ndash;&gt;-->
<!--&lt;!&ndash; GROUP BY p.id, o.org_id, o.org_name, p.name, p.sex, p.phone, p.photo, p.police_code, c.id, c.name, p.update_time&ndash;&gt;-->
</select>
<!--</select>-->
<!--<select id="getAllPolice" resultType="java.util.Map">-->
<!-- SELECT-->
......@@ -412,6 +412,21 @@ WHERE o.org_id IN
(select user_id FROM sys_user_org suo where suo.org_id=#{orgId}) as a
join sys_user_role sur on a.user_id=sur.user_id and sur.role_id="1663372320355389441"
</select>
<select id="getAllPolice" resultType="com.junmp.jyzb.entity.Policeman">
select min(id)as id,name,police_code,org_id_int as org_id
FROM base_policeman
where user_id is null
GROUP BY name,org_id_int,police_code
</select>
<select id="getUserIds" resultType="java.lang.Long">
select user_id from sys_user
</select>
<select id="selectUserById" resultType="com.junmp.v2.sys.api.bean.user.req.SysUserReq">
select a.*,b.org_id from
(select * from sys_user where user_id=#{userId}) as a
join sys_user_org as b on a.user_id=b.user_id
</select>
</mapper>
\ No newline at end of file
......@@ -43,7 +43,7 @@
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1 and vpss.year=#{year}
vpss.MONTH = 3 and vpss.year=#{year}
AND po.del_flag = 1
AND (po.org_id =#{orgId} OR po.org_parent_ids LIKE CONCAT( '%', #{orgId}, '%' ))
and vpss.create_time >= '2024-01-01 00:00:00' AND vpss.create_time &lt; '2025-01-01 00:00:00'
......@@ -66,10 +66,10 @@
COALESCE (sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ),0) AS end_price,
COALESCE (sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ),0) AS destory_num,
COALESCE (sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ),0) AS destory_price,
(SELECT `org_id` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%',#{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS d_name
(SELECT `org_id` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%',#{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS d_name
FROM
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
......@@ -123,7 +123,7 @@
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1
vpss.MONTH = 3
and `po`.`del_flag` = 1 and po.org_id =#{orgId}
GROUP BY vpss.type_id,vpss.type_name,vpss.size_name,vpss.size_id
......@@ -153,7 +153,7 @@
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.month = 1 and vpss.`year`= #{year} and po.del_flag=1
vpss.month = 3 and vpss.`year`= #{year} and po.del_flag=1
AND (po.org_id != #{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
AND(case when #{levelFlag} >=3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end ))
AND (
......@@ -183,10 +183,10 @@
COALESCE (sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ),0 ) AS end_price,
COALESCE (sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ),0 ) AS destory_num,
COALESCE (sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ),0 ) AS destory_price,
(SELECT `org_id` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS d_name
(SELECT `org_id` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS d_name
FROM
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
......@@ -232,7 +232,7 @@
FROM
vie_price_sum_summary vpss
WHERE
vpss.month = 1 and vpss.year=#{year}
vpss.month = 3 and vpss.year=#{year}
AND org_id_int = #{orgId}
and vpss.create_time >= '2024-01-01 00:00:00' AND vpss.create_time &lt; '2025-01-01 00:00:00'
<if test="typeIdsList!=null and typeIdsList.size() > 0">
......@@ -254,10 +254,10 @@
COALESCE(sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ),0) AS end_price,
COALESCE(sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ),0) AS destory_num,
COALESCE(sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ),0) AS destory_price,
(SELECT `org_id` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE `org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%') ORDER BY `level_flag` LIMIT 1) AS d_name
(SELECT `org_id` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_id,
(SELECT `org_code` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_code,
(SELECT `org_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS org_name,
(SELECT `d_name` FROM `pub_org` WHERE (`org_id` = #{orgId} OR `org_parent_ids` LIKE CONCAT('%', #{orgId}, '%')) and level_flag is not null ORDER BY `level_flag` LIMIT 1) AS d_name
FROM
vie_price_sum_summary vpss
WHERE
......@@ -295,7 +295,7 @@
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1
vpss.MONTH = 3
and `po`.`del_flag` = 1
<if test="level ==null " >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
......@@ -341,7 +341,7 @@
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1
vpss.MONTH = 3
and `po`.`del_flag` = 1
<if test="level ==null " >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
......@@ -451,7 +451,7 @@
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1 AND vpss.YEAR = 2024
vpss.MONTH = 3 AND vpss.YEAR = #{year}
AND po.del_flag = 1
<if test="level ==null" >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
......@@ -502,7 +502,7 @@
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.`year` = 2024
vpss.`year` = #{year}
AND po.del_flag = 1
<if test="level ==null" >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
......
......@@ -137,6 +137,15 @@ SET p.org_parent_ids = cte.org_parent_ids;
WHERE org_parent_id =#{orgId} and del_flag=1
AND level_flag = (SELECT level_flag FROM pub_org WHERE org_id = #{orgId}) + 1;
</select>
<select id="isRedirect" resultType="com.junmp.jyzb.entity.PubOrg">
select * FROM pub_org where org_id=(
select org_id FROM sys_user_org where user_id=(select user_id FROM sys_user where account=#{account})
)
</select>
<select id="selectLastNode" resultType="java.lang.Integer">
select count(*) from pub_org where org_parent_ids like CONCAT('%',#{orgId},'%')
</select>
</mapper>
\ No newline at end of file
......@@ -31,4 +31,11 @@
</foreach>
) and state="broken"
</select>
<select id="selectSum" resultType="com.junmp.jyzb.entity.VieDestoryGroup">
select * from vie_destory_group where (
<foreach collection="list" item="item" separator="or">
org_id ='${item[0]}' and warehouse_id ='${item[1]}' and type_id='${item[2]}' and size_id='${item[3]}'
</foreach>
) and state="destory"
</select>
</mapper>
......@@ -32,16 +32,20 @@
<update id="updateWareInfo">
<foreach collection="list" item="item" separator=";">
update
base_warehouse_inventory
base_warehouse_inventory wi
<set>
size_id=(select DISTINCT id FROM base_equipment_size where name=#{item.sizeName} and
wi.size_id=(select DISTINCT id FROM base_equipment_size where name=#{item.sizeName} and
type_id =(select DISTINCT id FROM base_equipment_type where name=#{item.typeName} limit 1) limit 1),
type_id=(select DISTINCT id FROM base_equipment_type where name=#{item.typeName} limit 1),
location_id=(select DISTINCT id FROM base_warehouse where name=#{item.locationName} limit 1),
update_time=#{updateTime},epc_type=1,location_state="in",location_type=0
where epc=#{item.epc}
wi.type_id=(select DISTINCT id FROM base_equipment_type where name=#{item.typeName} limit 1),
wi.location_id=(select DISTINCT id FROM base_warehouse where name=#{item.locationName} limit 1),
wi.update_time=#{updateTime},wi.epc_type=1,wi.location_state="in",wi.location_type=0
where wi.epc=#{item.epc}
</set>
</foreach>
</update>
<delete id="deleteBylocationId">
delete from base_warehouse_inventory where org_id=#{orgId} and location_id=#{locationId}
</delete>
</mapper>
......@@ -28,10 +28,10 @@ knife4j:
enable: true
setting:
enableDebug: false
# basic:
# enable: true
# username: ning
# password: ning
basic:
enable: true
username: ning
password: ning
spring:
datasource:
......
......@@ -3,7 +3,7 @@ scanner:
easy-es:
enable: true
address: 192.168.3.121:9200
address: 41.192.20.132:9200
username: elastic
password: junmp123
thing:
......@@ -28,21 +28,21 @@ knife4j:
enable: true
setting:
enableDebug: false
# basic:
# enable: true
# username: ning
# password: ning
basic:
enable: true
username: ning
password: ning
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true&allowMultiQueries=true
url: jdbc:mysql://127.0.0.1:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true&allowMultiQueries=true
username: root
password: 123456
redis:
#host: 192.168.3.188
host: 192.168.3.121
host: 127.0.0.1
port: 6379
database: 1
password:
......
......@@ -22,7 +22,7 @@ spring:
application:
name: jyzb-app
rabbitmq:
host: 192.168.3.121
host: 192.168.3.188
port: 5672
username: root
password: 123456
......
......@@ -196,32 +196,32 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
// }
}
//点击后消除已读消息,暂时不用,依赖前端处理
MessageReq reqmsg=new MessageReq();
reqmsg.setBizId(Long.valueOf(processInstanceId));
reqmsg.setReceiveUserId(StartUser.getUserId());
reqmsg.setReadFlag(0);
List<MessageRes> msgRes= messageApi.queryList(reqmsg);
if (msgRes.size()>0)
{
// 使用流将 id 取出,并用逗号拼接成字符串
String ids = msgRes.stream()
.map(MessageRes::getMsgId)
.map(String::valueOf) // 将 id 转换为字符串
.collect(Collectors.joining(","));
messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
}
String objJson= redisCache.get(processInstanceId);
redisCache.remove(processInstanceId);
List<MessageSendReq> msgs= JSONObject.parseArray(objJson,MessageSendReq.class);
if (CollectionUtil.isNotEmpty(msgs)){
msgs.forEach(msg->
{
messageApi.sendMessageNoToken(msg);
}
);
}
// MessageReq reqmsg=new MessageReq();
// reqmsg.setBizId(Long.valueOf(processInstanceId));
// reqmsg.setReceiveUserId(StartUser.getUserId());
// reqmsg.setReadFlag(0);
// List<MessageRes> msgRes= messageApi.queryList(reqmsg);
// if (msgRes.size()>0)
// {
// // 使用流将 id 取出,并用逗号拼接成字符串
// String ids = msgRes.stream()
// .map(MessageRes::getMsgId)
// .map(String::valueOf) // 将 id 转换为字符串
// .collect(Collectors.joining(","));
//// messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
// }
// String objJson= redisCache.get(processInstanceId);
// redisCache.remove(processInstanceId);
//
// List<MessageSendReq> msgs= JSONObject.parseArray(objJson,MessageSendReq.class);
// if (CollectionUtil.isNotEmpty(msgs)){
// msgs.forEach(msg->
// {
// messageApi.sendMessageNoToken(msg);
// }
//
// );
// }
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,ReturnMsg.PASS);
......@@ -866,20 +866,20 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
vo.setTaskId(tasks.get(0).getId());
}
//点击后消除已读消息,暂时不用,依赖前端处理
MessageReq reqmsg=new MessageReq();
reqmsg.setBizId(Long.valueOf(processInstanceId));
reqmsg.setReceiveUserId(StartUser.getUserId());
reqmsg.setReadFlag(0);
List<MessageRes> msgRes= messageApi.queryList(reqmsg);
if (msgRes.size()>0)
{
// 使用流将 id 取出,并用逗号拼接成字符串
String ids = msgRes.stream()
.map(MessageRes::getMsgId)
.map(String::valueOf) // 将 id 转换为字符串
.collect(Collectors.joining(","));
messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
}
// MessageReq reqmsg=new MessageReq();
// reqmsg.setBizId(Long.valueOf(processInstanceId));
// reqmsg.setReceiveUserId(StartUser.getUserId());
// reqmsg.setReadFlag(0);
// List<MessageRes> msgRes= messageApi.queryList(reqmsg);
// if (msgRes.size()>0)
// {
// // 使用流将 id 取出,并用逗号拼接成字符串
// String ids = msgRes.stream()
// .map(MessageRes::getMsgId)
// .map(String::valueOf) // 将 id 转换为字符串
// .collect(Collectors.joining(","));
// messageApi.batchReadFlagByMessageIds(ids, MsgReadStateEnum.READ);
// }
String tempID= flowInstanceService.getFormIdByInstanceId(processInstanceId);//先拿到表单id,然后通过表单拿到初始表结构
ProcessTemplates processTemplates = processTemplateService.getById(tempID);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论