UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
郑明梁 2 years ago
parent bd641b6063 b0421c0298
commit b4997b7ec7
5 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File

5
src/main/java/com/glxp/api/controller/auth/LoginController.java
Unescape Escape View File

@ -318,7 +318,6 @@ public class LoginController extends BaseController {
}
@Autowired
private InvWarehouseDao invWarehouseDao;
@ -369,7 +368,7 @@ public class LoginController extends BaseController {
@GetMapping("/spms/inv/warehouse/filterInv/forUdims")
public BaseResponse forUdims() {
FilterInvWarehouseRequest filterInvWarehouseRequest=new FilterInvWarehouseRequest();
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setSpUse(true);
List<DeptEntity> data = deptService.filterInvDept(filterInvWarehouseRequest);
return ResultVOUtils.success(data);
@ -407,8 +406,8 @@ public class LoginController extends BaseController {
}
//------------------------------------------UDIMS接口-----------------------------------------------------------
/**
* 平台验证
*

2
src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
Unescape Escape View File

@ -304,7 +304,7 @@ public class BasicBussinessTypeEntity {
private boolean changeEnable;
/**
* 是否供应商使用
* 是否供应商使用 0:无权限；1：可查看；2：可修改
*/
@TableField(value = "spUse")
private int spUse;

28
src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java
Unescape Escape View File

@ -70,11 +70,11 @@ public class IoOrderUtilsService {
//扫码明细表生成
FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
List<IoCodeTempEntity> ioCodeTempEntities = new ArrayList<>();
for (IoCodeEntity ioCodeTempEntity : ioCodeEntityList) {
for (IoCodeEntity ioCodeEntity : ioCodeEntityList) {
IoCodeTempEntity ioCodeTempEntity1 = new IoCodeTempEntity();
//查询物资信息
filterCompanyProductRelevanceRequest.setCustomerId(Long.valueOf(platformLinkRespons.getCustomerId()));
filterCompanyProductRelevanceRequest.setNameCode(ioCodeTempEntity.getNameCode());
filterCompanyProductRelevanceRequest.setNameCode(ioCodeEntity.getNameCode());
List<ioOrderUploadRequest> udiRlSupEntityList = udiRlSupDao.filterCompanyProduct(filterCompanyProductRelevanceRequest);
if (CollectionUtil.isNotEmpty(udiRlSupEntityList) && udiRlSupEntityList.size() > 1) {
ioCodeTempEntity1.setRelId(null);
@ -82,23 +82,23 @@ public class IoOrderUtilsService {
} else {
if (CollectionUtil.isNotEmpty(udiRlSupEntityList)) {
ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId());
map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0));
map.put(ioCodeEntity.getRelId(), udiRlSupEntityList.get(0));
}
ioCodeTempEntity1.setOrderId(billNO);
String code = URLDecoder.decode(ioCodeTempEntity.getCode(), StandardCharsets.UTF_8);
String code = URLDecoder.decode(ioCodeEntity.getCode(), StandardCharsets.UTF_8);
ioCodeTempEntity1.setCode(code);
ioCodeTempEntity1.setMainAction(ioCodeTempEntity.getMainAction());
ioCodeTempEntity1.setMainAction(ioCodeEntity.getMainAction());
ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction());
ioCodeTempEntity1.setNameCode(ioCodeTempEntity.getNameCode());
ioCodeTempEntity1.setBatchNo(ioCodeTempEntity.getBatchNo());
ioCodeTempEntity1.setProduceDate(ioCodeTempEntity.getProduceDate());
ioCodeTempEntity1.setExpireDate(ioCodeTempEntity.getExpireDate());
ioCodeTempEntity1.setSerialNo(ioCodeTempEntity.getSerialNo());
ioCodeTempEntity1.setPackageLevel(ioCodeTempEntity.getPackageLevel());
ioCodeTempEntity1.setSupId(ioCodeTempEntity.getSupId());
ioCodeTempEntity1.setCount(ioCodeTempEntity.getCount());
ioCodeTempEntity1.setReCount(ioCodeTempEntity.getReCount());
ioCodeTempEntity1.setNameCode(ioCodeEntity.getNameCode());
ioCodeTempEntity1.setBatchNo(ioCodeEntity.getBatchNo());
ioCodeTempEntity1.setProduceDate(ioCodeEntity.getProduceDate());
ioCodeTempEntity1.setExpireDate(ioCodeEntity.getExpireDate());
ioCodeTempEntity1.setSerialNo(ioCodeEntity.getSerialNo());
ioCodeTempEntity1.setPackageLevel(ioCodeEntity.getPackageLevel());
ioCodeTempEntity1.setSupId(ioCodeEntity.getSupId());
ioCodeTempEntity1.setCount(ioCodeEntity.getCount());
ioCodeTempEntity1.setReCount(ioCodeEntity.getReCount());
ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode());
ioCodeTempEntity1.setInvCode(platformLinkRespons.getInvSubCode());
ioCodeTempEntity1.setUpdateTime(new Date());

3
src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
Unescape Escape View File

@ -411,7 +411,8 @@
auth_warehouse.name,
auth_warehouse.parentId,
auth_warehouse.parentCode,
auth_dept.name warehouseName,
auth_dept.name deptName,
auth_dept.code deptCode,
auth_warehouse.advanceType
from auth_warehouse
inner join auth_dept on auth_warehouse.parentId = auth_dept.code

9
src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
Unescape Escape View File

@ -165,7 +165,11 @@
basic_bussiness_type.name
from auth_warehouse_bustype
inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action
where code = #{code}
where spUse = 2
and mainAction = 'WareHouseIn'
and enable = true
and corpType = 2
and code = #{code}
</select>
@ -189,7 +193,8 @@
b1.`name`
FROM auth_warehouse_bustype a1
INNER JOIN basic_bussiness_type b1 ON a1.action = b1.action
where b1.spUse=1 and a1.code = #{code}
where b1.spUse = 1
and a1.code = #{code}
group by b1.id
</select>
</mapper>

Write Preview
Loading…
Cancel
Save