From fbc49df4eea567a1a12074318d789dbde2f1ff6b Mon Sep 17 00:00:00 2001
From: liuxm <liuxm_a@163.com>
Date: 星期二, 04 六月 2024 09:53:59 +0800
Subject: [PATCH] 生产计划部分修改
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
index 6f2600d..c9f9598 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
@@ -85,6 +85,7 @@
return assemblyDao.insertSelective(plan);
}
+ @Transactional
public int update(PrAssemblyPlan plan){
PrAssemblyPlan origPlan = assemblyDao.selectByPrimaryKey(plan.id);
PrBatchNumber batch = batchDao.selectByPrimaryKey(origPlan.batchId);
@@ -100,7 +101,7 @@
}
-
+ @Transactional
public int addEquip(Long planId,int num){
PrAssemblyPlan plan = assemblyDao.selectByPrimaryKey(planId);
PrBatchNumber batch = batchDao.selectByPrimaryKey(plan.batchId);
@@ -134,7 +135,7 @@
return insertBatchEquip(list);
}
- public int insertBatchEquip(List<PrEquip> list) {
+ private int insertBatchEquip(List<PrEquip> list) {
int count = 0;
for (int i = 0; i < list.size(); i += BATCH_SIZE) {
List<PrEquip> subList = list.subList(i, Math.min(i + BATCH_SIZE, list.size()));
@@ -209,7 +210,7 @@
public QueryResultVo<List<PrEquip>> selectSomeEquip(QueryVo queryVo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
//鏌ヨ绗﹀悎鏉′欢鐨勮褰曟�绘暟
- Long itemTotal = assemblyDao.selectSomeCount(params);
+ Long itemTotal = equipDao.selectSomeCount(params);
QueryResultVo<List<PrEquip>> rsVo = new QueryResultVo<>(queryVo.pageSize, queryVo.pageCurr) ;
//璁＄畻鍒嗛〉绛変俊鎭�
rsVo.calculateAndSet(itemTotal, params);
@@ -224,4 +225,17 @@
public List<PrEquip> selectEquipByBatchId(Long batchId) {
return equipDao.selectByBatchId(batchId);
}
+
+ /**
+ * 鍙洿鏂扮姸鎬�,涓嶆洿鏂板叾浠栧瓧娈�
+ * @param plan
+ * @return
+ */
+ @Transactional
+ public int updateStatus(PrAssemblyPlan plan) {
+ PrAssemblyPlan param = new PrAssemblyPlan();
+ param.id =plan.id;
+ param.status = plan.status;
+ return assemblyDao.updateByPrimaryKeySelective(plan);
+ }
}
--
Gitblit v1.8.0