Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

岗位修复

Browse Source
This commit is contained in:
lym
2024-10-29 11:08:33 +08:00
parent 7573616d0c
commit 1dccb8a267
6 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+2 -2
View File
@@ -214,7 +214,7 @@ public class OrderController {
JSONObject plate = apiDataAchieve.getApiPlateDetailMessage(token, orderNo).get();
JSONObject dataModule = apiDataAchieve.getApiGroupMessage(token, orderNo).get();
JSONObject block = apiDataAchieve.getApiBlocksMessage(token, orderNo).get();
Map<String, List<?>> listMap = apiTypeRealize.apiPlateDataChange(
Map<String, Object> listMap = apiTypeRealize.apiPlateDataChange(
order,
dataPlates,//板件生产信息
dataParts,// 配件信息
@@ -398,7 +398,7 @@ public class OrderController {
@Parameter(name = "deleted", description = "是否删除", example = "false")
})
@PreAuthorize("@ss.hasPermission('production:manager-list:detail')")
public CommonResult<Map<String, List<?>>> getModule(@RequestParam("orderId") Long orderId,
public CommonResult<Map<String, Object>> getModule(@RequestParam("orderId") Long orderId,
@RequestParam(value = "deleted", required = false, defaultValue = "false") Boolean deleted) {
if (deleted == null) {
deleted = false;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java
+2 -7
View File
@@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
@@ -145,13 +146,7 @@ public class OrderInputProcessor {
plateGoodMapper.insertBatch(plateGoodDOS.stream().skip(i).limit(1000).collect(Collectors.toList()));
}
}
//rawGoodsMapper.insertBatch(rawGoodsDOS);
//orderBodyMapper.insertBatch(orderBodyDOS);
//orderGroupMapper.insertBatch(orderGroupDOS);
//orderPartsMapper.insertBatch(orderPartsDOS);
//plateMapper.insertBatch(plateDOS);
//orderModuleExtraMapper.insertBatch(orderModuleExtraDOS);
//orderItemMapper.insertBatch(itemDOS);
}
/**
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java
+3 -3
View File
@@ -60,9 +60,9 @@ public interface OrderService {
/**
* @param orderId: 生产单Id
* @return Map<String, List<?>>
* @return Map<String, Object>
*/
Map<String,List<?>> getModule(Long orderId, Integer deleted);
Map<String,Object> getModule(Long orderId, Integer deleted);
/**
* @param orderId: 生产单id
@@ -98,7 +98,7 @@ public interface OrderService {
* @author Administrator
* @date 2024/3/30
*/
Long importApiData(Map<String, List<?>> listMap);
Long importApiData(Map<String, Object> listMap);
/**
* 文件数据导入
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+5 -5
View File
@@ -208,14 +208,14 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public Map<String, List<?>> getModule(Long orderId, Integer deleted) {
public Map<String, Object> getModule(Long orderId, Integer deleted) {
// 柜体信息
List<OrderModuleRespVO> orderModuleRespVOList = orderBodyMapper.selectModuleByOrderId(orderId, getUserOrganId(), deleted);
// 配件
List<OrderPlatesDetailRespVO> orderItemDOS = orderItemMapper.selectPartsByOrderId(orderId, getUserOrganId(), deleted);
Map<String, List<?>> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
map.put("module", orderModuleRespVOList);
map.put("parts", orderItemDOS);
return map;
@@ -362,7 +362,7 @@ public class OrderServiceImpl implements OrderService {
@Override
@Transactional(rollbackFor = Exception.class)
public Long importApiData(Map<String, List<?>> listMap) {
public Long importApiData(Map<String, Object> listMap) {
List<OrderDO> order = (List<OrderDO>) listMap.get("orderDO");
if (order != null && order.size() > 0) {
OrderDO orderDO = order.get(0);
@@ -394,11 +394,11 @@ public class OrderServiceImpl implements OrderService {
orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, itemDO, goodsDO, plateGoodDOS);
List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
if (orderModelDOs.size() > 0) {
if (!orderModelDOs.isEmpty()) {
orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId()));
orderInputProcessor.batchSaveModel(orderModelDOs);
}
if (partsRemark.size() > 0) {
if (!partsRemark.isEmpty()) {
orderInputProcessor.batchSaveOrderPartsModel(partsRemark);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+2 -2
View File
@@ -66,12 +66,12 @@ public class ApiTypeRealize {
* @author Administrator
* @date 2024/5/6
*/
public Map<String, List<?>> apiPlateDataChange(JSONObject order, JSONObject dataPlates, JSONObject dataParts
public Map<String, Object> apiPlateDataChange(JSONObject order, JSONObject dataPlates, JSONObject dataParts
, JSONObject dataBody, JSONObject dataGoods
, JSONObject plates, JSONObject dataModule
, JSONObject dataBlocks, String orderNo,Long orderId, Long organId) {
Map<String, List<?>> map = new HashMap<>();
Map<String, Object> map = new HashMap<>();
// 生产单id
// Long orderId = (Long) identifierGenerator.nextId(null);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/dept/PostMapper.java
+18 -13
View File
@@ -3,6 +3,7 @@ package com.cf.imes.module.system.dal.mysql.dept;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.framework.security.core.LoginUser;
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
import com.cf.imes.module.system.controller.admin.dept.vo.post.PostPageReqVO;
@@ -35,28 +36,32 @@ public interface PostMapper extends BaseMapperX<PostDO> {
lambdaQueryWrapperX.eqIfPresent(PostDO::getOrganId, loginUser.getOrganId());
}
// 获取分页结果
PageResult<PostDO> pageResult = selectPage(reqVO, lambdaQueryWrapperX
// PageResult<PostDO> pageResult = selectPage(reqVO, lambdaQueryWrapperX
// .likeIfPresent(PostDO::getCode, reqVO.getCode())
// .likeIfPresent(PostDO::getName, reqVO.getName())
// .eqIfPresent(PostDO::getStatus, reqVO.getStatus())
// .orderByDesc(PostDO::getSort));
// 重新设置 id 值
// List<PostDO> records = pageResult.getList();
// for (int i = 0; i < records.size(); i++) {
// PostDO postDO = records.get(i);
// postDO.setId((long) (i + 1));
// }
return selectPage(reqVO, lambdaQueryWrapperX
.likeIfPresent(PostDO::getCode, reqVO.getCode())
.likeIfPresent(PostDO::getName, reqVO.getName())
.eqIfPresent(PostDO::getStatus, reqVO.getStatus())
.orderByDesc(PostDO::getId));
// 重新设置 id 值
List<PostDO> records = pageResult.getList();
for (int i = 0; i < records.size(); i++) {
PostDO postDO = records.get(i);
postDO.setId((long) (i + 1));
}
return pageResult;
.orderByDesc(PostDO::getSort));
}
default PostDO selectByName(String name) {
return selectOne(PostDO::getName, name);
return selectOne(PostDO::getName, name, PostDO::getOrganId, OrganContextHolder.getOrganId());
}
default PostDO selectByCode(String code) {
return selectOne(PostDO::getCode, code);
return selectOne(PostDO::getCode, code, PostDO::getOrganId, OrganContextHolder.getOrganId());
}
}