CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

commit for pull

Browse Source
This commit is contained in:
caixiang
2023-02-23 14:28:05 +08:00
parent 1ebe39b60a
commit 16f3cd5d30
15 changed files with 258 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java
View File

@@ -4,6 +4,7 @@ import com.cnbm.dynamic.datasource.annotation.DataSource;
import com.cnbm.packing.dto.WoPowerLevelDTO;
import com.cnbm.packing.mapper.CamlineMapper;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,28 +24,20 @@ public class DynamicDataSourceService {
WoPowerLevelServiceBiz powerLevelServiceBiz;
public Integer getTodayBoxNum(){
return mapper.getTodayBoxNum();
}
@DataSource("camline")
@Transactional
@DataSource("slave1")
public void salve1Get(){
WoPowerLevelDTO woPowerLevelDTO = powerLevelServiceBiz.get(Long.valueOf(1));
System.out.println(woPowerLevelDTO.toString());
}
public void getTodayBoxNum(){
Integer todayBoxNum = mapper.getTodayBoxNum();
System.out.println(todayBoxNum);
}
public float getPMPPBySubId(String subId){
return mapper.getPMPPBySubId(subId);
}
@DataSource("slave2")
@DataSource("camline")
@Transactional
public void salve3Get(){
float byid = mapper.getByid("LTWeight");
System.out.println(byid);
public String getOrderNameBySubId(String subId){
return mapper.getOrderNameBySubId(subId);
}
}

4
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
View File

@@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -28,5 +29,6 @@ public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, Wo
void delete(Long[] ids);
List<WoPackagingBoxDTO> list();
int updateIsArrivedByBoxNo(Integer isArrived, String boxNo);
}

5
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
View File

@@ -4,6 +4,7 @@ import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
@@ -32,5 +33,7 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
void replaceSubstrate(WoPackagingBoxSubstrateDTO[] dtos);
void batchInsert(WoPackagingBoxSubstrateDTO[] lists);
WoPackagingBoxSubstrate getBySubId(String subId);
int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId,String woSubstrateId);
}

11
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@@ -3,17 +3,11 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPowerLevelDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.mapper.WoPackagingBoxMapper;
import com.cnbm.packing.mapper.WoPackagingBoxMapper;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import org.apache.commons.lang3.StringUtils;
@@ -109,5 +103,8 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
return list;
}
@Override
public int updateIsArrivedByBoxNo(Integer isArrived, String boxNo) {
return mapper.updateIsArrivedByBoxNo(isArrived,boxNo);
}
}

9
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
View File

@@ -162,4 +162,13 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
}
}
@Override
public WoPackagingBoxSubstrate getBySubId(String subId) {
return woPackagingBoxSubstrateMapper.getOneByWoSubstrateId(subId);
}
@Override
public int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId, String woSubstrateId) {
return woPackagingBoxSubstrateMapper.updatePackagingBoxIdByWoSubstrateId(packagingBoxId,woSubstrateId);
}
}