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

定量设置相关修改

Browse Source
test
anthonywj 1 year ago
parent 7a1f295fa7
commit ac4774981d
12 changed files with 86 additions and 34 deletions
Show Stats Download Patch File Download Diff File

20
src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -436,16 +436,16 @@ public class PurOrderReceiveController extends BaseController {
purApplyService.insert(purApplyEntity);
//用stream流复制list
List<PurApplyDetailEntity> purApplyDetailEntityList = purReceiveDetailEntityList.stream().map(e -> {
PurApplyDetailEntity d = new PurApplyDetailEntity();
d.setOrderIdFk(purApplyEntity.getId() + "");
d.setProductId(e.getRelIdFk());
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
d.setProductName(udiProductEntity.getCpmctymc());
d.setCount(e.getCount());
d.setSupId(e.getSupId());
d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
return d;
})
PurApplyDetailEntity d = new PurApplyDetailEntity();
d.setOrderIdFk(purApplyEntity.getId() + "");
d.setProductId(e.getRelIdFk());
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
d.setProductName(udiProductEntity.getCpmctymc());
d.setCount(e.getCount());
d.setSupId(e.getSupId());
d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
return d;
})
.collect(Collectors.toList());
purApplyDetailService.insertPurApplyDetailEntity(purApplyDetailEntityList);

2
src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java
Unescape Escape View File

@ -15,7 +15,7 @@ public class UpdateReceiveDetailRequest {
/**
* 产品ID
*/
private Integer relIdFk;
private Long relIdFk;
private String nameCode;

2
src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java
Unescape Escape View File

@ -15,7 +15,7 @@ public class ReceiveDetailResponse {
/**
* 产品ID
*/
private Integer relIdFk;
private Long relIdFk;
private String nameCode;

2
src/main/java/com/glxp/api/res/inv/InvProductResponse.java
Unescape Escape View File

@ -40,8 +40,8 @@ public class InvProductResponse {
/**
* 生产日期
*/
private String productionDate;
private String produceDate;
/**
* 过期时间
*/

18
src/main/java/com/glxp/api/service/inv/InvProductRationService.java
Unescape Escape View File

@ -152,7 +152,7 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
if (StrUtil.isNotEmpty(rationEntity.getBusOrder())) {
PurReceiveEntity temp = receiveService.selectByBillNo(rationEntity.getBusOrder());
if (temp != null && IntUtil.value(temp.getStatus()) <= 2) {
continue;
receiveService.delReceive(temp.getBillNo());
}
}
int count = IntUtil.value(rationEntity.getRationCount()) - IntUtil.value(rationEntity.getInvCount());
@ -215,7 +215,8 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
if (StrUtil.isNotEmpty(rationEntity.getBusOrder())) {
PurApplyEntity temp = purApplyService.selectByBillNo(rationEntity.getBusOrder());
if (temp != null && IntUtil.value(temp.getStatus()) <= 2) {
continue;
purApplyService.deleteById(temp.getId());
purApplyDetailService.deleteByOrderId(temp.getId() + "");
}
}
@ -273,6 +274,15 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
//生成单据详情
for (InvProductRationEntity rationEntity : invProductRationEntities) {
if (StrUtil.isNotEmpty(rationEntity.getBusOrder())) {
PurPlanEntity temp = purPlanService.selectByBillNo(rationEntity.getBusOrder());
if (temp != null && IntUtil.value(temp.getStatus()) <= 2) {
purPlanService.deleteById(temp.getId());
purPlanDetailService.deleteByOrderId(temp.getId() + "");
}
}
int count = IntUtil.value(rationEntity.getRationCount()) - IntUtil.value(rationEntity.getInvCount());
if (count > 0) {
PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity();
@ -337,7 +347,8 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
if (StrUtil.isNotEmpty(rationEntity.getBusOrder())) {
PurOrderEntity temp = purOrderService.selectByBillNo(rationEntity.getBusOrder());
if (temp != null && IntUtil.value(temp.getStatus()) <= 2) {
continue;
purOrderService.deleteById(temp.getId());
purOrderDetailService.deleteByOrderId(temp.getId() + "");
}
}
@ -416,7 +427,6 @@ public class InvProductRationService extends ServiceImpl<InvProductRationMapper,
}
}
int count = IntUtil.value(rationEntity.getRationCount()) - IntUtil.value(rationEntity.getInvCount());
if (count > 0) {
IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity();

1
src/main/java/com/glxp/api/service/purchase/PurPlanService.java
Unescape Escape View File

@ -22,5 +22,6 @@ public interface PurPlanService {
PurPlanEntity selectById(Long id);
PurPlanEntity selectByBillNo(String billNo);
}

2
src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java
Unescape Escape View File

@ -39,7 +39,7 @@ public class PurApplyDetailService extends ServiceImpl<PurApplyDetailDao, PurApp
public List<PurApplyDetailEntity> findByOrderId(String orderId) {
if (orderId == null) {
return null;
return Collections.emptyList();
}
PurApplyDetailRequest purApplyDetailRequest = new PurApplyDetailRequest();
purApplyDetailRequest.setOrderIdFk(orderId);

6
src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.purchase.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.purchase.PurPlanDao;
import com.glxp.api.entity.purchase.PurPlanEntity;
@ -57,4 +58,9 @@ public class PurPlanServiceImpl implements PurPlanService {
public PurPlanEntity selectById(Long id) {
return purPlanDao.selectById(id);
}
@Override
public PurPlanEntity selectByBillNo(String billNo) {
return purPlanDao.selectOne(new QueryWrapper<PurPlanEntity>().eq("billNo", billNo).last("limit 1"));
}
}

2
src/main/java/com/glxp/api/task/AsyncInvRationTask.java
Unescape Escape View File

@ -42,7 +42,7 @@ public class AsyncInvRationTask implements SchedulingConfigurer {
ScheduledRequest scheduledRequest = new ScheduledRequest();
scheduledRequest.setCronName("syncInvRation");
ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/10 * * * ?";
String cron = scheduledEntity != null ? scheduledEntity.getCron() : "0 0/60 * * * ?";
if (cron.isEmpty()) {
logger.error("cron is null");
}

28
src/main/resources/mybatis/mapper/inv/InvProductRationMapper.xml
Unescape Escape View File

@ -34,21 +34,21 @@
<select id="filterList" resultType="com.glxp.api.res.inv.InvProductRationResponse"
parameterType="com.glxp.api.req.inv.InvProductRationRequest">
select ip.*,
bp.cpmctymc,
bp.measname,
bp.ggxh,
bp.ylqxzcrbarmc,
bp.zczbhhzbapzbh,
bp.nameCode,
basic_corp.name supName,
auth_warehouse.name invName,
bbt.name scanTypeName
bp.cpmctymc,
bp.measname,
bp.ggxh,
bp.ylqxzcrbarmc,
bp.zczbhhzbapzbh,
bp.nameCode,
basic_corp.name supName,
auth_warehouse.name invName,
bbt.name scanTypeName
from inv_product_ration ip
inner join basic_udirel on ip.relId = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ip.supId = basic_corp.erpId
left join auth_warehouse on auth_warehouse.code = ip.curInvCode
left join basic_bussiness_type bbt on ip.scanType = bbt.action
left join basic_udirel on ip.relId = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ip.supId = basic_corp.erpId
left join auth_warehouse on auth_warehouse.code = ip.curInvCode
left join basic_bussiness_type bbt on ip.scanType = bbt.action
<where>
bp.diType = 1
<if test="cpmctymc != null and cpmctymc != ''">

2
src/main/resources/mybatis/mapper/inv/invProductDao.xml
Unescape Escape View File

@ -155,7 +155,7 @@
bp.ggxh,
ip.batchNo,
ip.code,
ip.produceDate,
ip.produceDate productionDate,
ip.expireDate,
ip.serialNo,
basic_corp.NAME supName,

35
src/main/resources/schemas/schema_v2.3.sql
Unescape Escape View File

@ -918,3 +918,38 @@ CALL Pro_Temp_ColumnWork('inv_pre_product_detail', 'inBatchNo', 'varchar(255)',
INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
`paramType`, `paramExplain`, `updateTime`)
VALUES (20078, 0, '是否启用价格先进先出策略', 'price_fifo', '1', 1, 0, '0：否；1：是', '2023-10-10 10:10:08');
CREATE TABLE if not exists `inv_product_ration`
(
`id` int NOT NULL AUTO_INCREMENT,
`relId` bigint NULL DEFAULT NULL COMMENT '产品ID',
`supId` bigint NULL DEFAULT NULL COMMENT '供应商ID',
`rationCount` int NULL DEFAULT NULL COMMENT '定量数',
`invCount` int NULL DEFAULT NULL COMMENT '库存数',
`busType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '业务单据类型',
`scanType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '扫码单据类型',
`curInvCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '当前仓库',
`lyInvCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '业务-领用仓库',
`sgInvCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '业务-申购采购仓库',
`jhInvCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '业务-计划采购仓库',
`cgInvCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '业务-订单采购仓库',
`fromInvCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '出入库-往来仓库',
`auditStatus` tinyint NULL DEFAULT NULL COMMENT '出入库-审核状态',
`busAuditStatus` tinyint NULL DEFAULT NULL COMMENT '业务-审核状态',
`scanOrder` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成扫码单据',
`busOrder` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成业务单据',
`updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
`updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
`createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB
AUTO_INCREMENT = 8
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic;
INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
VALUES (150, 'syncInvRation', '0 */60 * * * ?', NULL, '定量设置单据');

Write Preview
Loading…
Cancel
Save