().lambda()
+ .eq(GroupPlate::getStoragevehicle_code, dto.getVehicle_code())
+ );
}
}
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java
index f056be2..1b18ce8 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackOutTask.java
@@ -3,6 +3,7 @@ package org.nl.wms.sch_manage.service.util.tasks;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.nl.common.exception.BadRequestException;
@@ -21,7 +22,9 @@ import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.warehouse_management.enums.IOSConstant;
import org.nl.wms.warehouse_management.enums.IOSEnum;
import org.nl.wms.warehouse_management.service.IOutBillService;
+import org.nl.wms.warehouse_management.service.dao.GroupPlate;
import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_management.service.dao.mapper.GroupPlateMapper;
import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -31,7 +34,7 @@ import javax.annotation.Resource;
/**
*
- * 退货出库出库任务类
+ * 退货出库任务类
*
*
* @author Liuxy
@@ -71,6 +74,12 @@ public class BackOutTask extends AbstractTask {
@Resource
private PdaPointTask pdaPointTask;
+ /*
+ * 组盘记录服务
+ */
+ @Resource
+ private GroupPlateMapper groupPlateMapper;
+
@Override
public String create(JSONObject json) {
SchBaseTask task = new SchBaseTask();
@@ -212,6 +221,13 @@ public class BackOutTask extends AbstractTask {
@Override
public void taskConfirm(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
+ // 删除组盘信息
+ groupPlateMapper.delete(
+ new QueryWrapper().lambda()
+ .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code())
+ .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
+ );
+
// 判断point_code3是否有值; 有值需要生成点位点任务到库外站点
if (ObjectUtil.isNotEmpty(taskObj.getPoint_code3())) {
createAgvTask(taskObj);
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java
index a9ec762..89c647a 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java
@@ -3,6 +3,7 @@ package org.nl.wms.sch_manage.service.util.tasks;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
@@ -21,6 +22,8 @@ import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.warehouse_management.enums.IOSConstant;
import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_management.service.dao.GroupPlate;
+import org.nl.wms.warehouse_management.service.dao.mapper.GroupPlateMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +60,12 @@ public class EmpVehicleInTask extends AbstractTask {
@Resource
private ISchBasePointService iSchBasePointService;
+ /*
+ * 组盘记录服务
+ */
+ @Resource
+ private GroupPlateMapper groupPlateMapper;
+
@Override
public String create(JSONObject json) {
SchBaseTask task = new SchBaseTask();
@@ -142,10 +151,6 @@ public class EmpVehicleInTask extends AbstractTask {
this.cancelTask(taskObj);
}
- @Override
- public void taskConfirm(String task_code) {
- }
-
@Transactional
public void finishTask(SchBaseTask taskObj) {
// 更新起点
@@ -169,6 +174,7 @@ public class EmpVehicleInTask extends AbstractTask {
taskObj.setRemark("已完成");
taskObj.setTask_status(TaskStatus.FINISHED.getCode());
taskService.updateById(taskObj);
+ this.taskConfirm(taskObj.getTask_code());
}
@Transactional
@@ -186,4 +192,15 @@ public class EmpVehicleInTask extends AbstractTask {
taskObj.setTask_status(TaskStatus.CANCELED.getCode());
taskService.updateById(taskObj);
}
+
+ @Override
+ public void taskConfirm(String task_code) {
+ SchBaseTask taskObj = taskService.getByCode(task_code);
+ // 删除组盘信息
+ groupPlateMapper.delete(
+ new QueryWrapper().lambda()
+ .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code())
+ );
+ }
+
}
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java
index d63276b..5b676c5 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/HandOutTask.java
@@ -3,6 +3,7 @@ package org.nl.wms.sch_manage.service.util.tasks;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.nl.common.exception.BadRequestException;
@@ -20,7 +21,9 @@ import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.warehouse_management.enums.IOSEnum;
import org.nl.wms.warehouse_management.service.IOutBillService;
+import org.nl.wms.warehouse_management.service.dao.GroupPlate;
import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
+import org.nl.wms.warehouse_management.service.dao.mapper.GroupPlateMapper;
import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -64,6 +67,12 @@ public class HandOutTask extends AbstractTask {
@Resource
private ISchBasePointService iSchBasePointService;
+ /*
+ * 组盘记录服务
+ */
+ @Resource
+ private GroupPlateMapper groupPlateMapper;
+
@Override
public String create(JSONObject json) {
SchBaseTask task = new SchBaseTask();
@@ -198,5 +207,13 @@ public class HandOutTask extends AbstractTask {
@Override
public void taskConfirm(String task_code) {
+ SchBaseTask taskObj = taskService.getByCode(task_code);
+
+ // 删除组盘信息
+ groupPlateMapper.delete(
+ new QueryWrapper().lambda()
+ .eq(GroupPlate::getStoragevehicle_code, taskObj.getVehicle_code())
+ .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
+ );
}
}
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
index 07464d4..57f9aac 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
@@ -100,6 +100,11 @@ public class GroupPlate implements Serializable {
*/
private String box_type;
+ /**
+ * 工单信息
+ */
+ private String bom_id;
+
/**
* 组盘人
*/
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml
index e9ef918..91d14be 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/IOStorInvMapper.xml
@@ -100,7 +100,7 @@
LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
LEFT JOIN md_pb_groupplate late ON mb.material_id = late.material_id
- AND dtl.pcsn = late.pcsn AND late.status = '1'
+ AND dtl.pcsn = late.pcsn AND late.status = '1' AND dtl.plan_qty = late.qty
where
1=1
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
index 7a70c97..91a1a31 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
@@ -1202,25 +1202,14 @@ public class OutBillServiceImpl extends ServiceImpl
//查询明细信息
IOStorInvDtl ioStorInvDtl = ioStorInvDtlMapper.selectById(ioStorInvDis.getIostorinvdtl_id());
- // 如果单据类型为：质检出库、领料出库、烘干出库则更新为出库，否则删除组盘记录
- if (ioStorInvDtl.getIs_check().equals(IOSConstant.ONE)) {
- groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
- .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
- .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
- .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
- .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
- .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
- );
- } else {
- // 删除组盘信息
- groupPlateMapper.delete(
- new QueryWrapper().lambda()
- .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
- .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
- .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
- .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
- );
- }
+ // 更新组盘信息为出库
+ groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
+ .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
+ .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
+ .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
+ .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
+ .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
+ );
}
@@ -1297,25 +1286,14 @@ public class OutBillServiceImpl extends ServiceImpl
updateIvtList.add(jsonIvt);
iMdPbStoragevehicleextService.updateIvt(updateIvtList);
- // 如果单据类型为：质检出库、领料出库、烘干出库则更新为出库，否则删除组盘记录
- if (ioStorInvDtl.getIs_check().equals(IOSConstant.ONE)) {
- groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
- .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
- .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
- .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
- .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
- .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
- );
- } else {
- // 删除组盘信息
- groupPlateMapper.delete(
- new QueryWrapper().lambda()
- .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
- .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
- .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
- .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
- );
- }
+ // 更新组盘信息为出库
+ groupPlateMapper.update(new GroupPlate(), new LambdaUpdateWrapper<>(GroupPlate.class)
+ .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
+ .eq(GroupPlate::getPcsn, ioStorInvDis.getPcsn())
+ .eq(GroupPlate::getStoragevehicle_code, ioStorInvDis.getStoragevehicle_code())
+ .eq(GroupPlate::getMaterial_id, ioStorInvDis.getMaterial_id())
+ .eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
+ );
// 查询该明细下是否还有未完成的分配明细
int countDis = ioStorInvDisMapper.selectCount(new LambdaQueryWrapper<>(IOStorInvDis.class)
diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java
index ef1ed63..9ff9b0a 100644
--- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java
+++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/SelectOutServiceImpl.java
@@ -212,7 +212,7 @@ public class SelectOutServiceImpl extends ServiceImpl().lambda()
.eq(GroupPlate::getStoragevehicle_code, dto.getSelect_vehicle())
.eq(GroupPlate::getMaterial_id, disDao.getMaterial_id())
- .eq(GroupPlate::getPcsn, dto.getPcsn())
+ .eq(GroupPlate::getPcsn, dto.getSelect_pcsn())
.eq(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("出库"))
);
// 新增组盘信息
@@ -229,9 +229,16 @@ public class SelectOutServiceImpl extends ServiceImpl().lambda()
+ .set(PdmBomCallMaterialDtl::getVehicle_code,dto.getNew_vehicle())
+ .eq(PdmBomCallMaterialDtl::getOut_dis_id, disDao.getIostorinvdis_id())
+ );
}
- // 删除其他组盘信息
+ /*// 删除其他组盘信息
List deleteGroupDisList = ioStorInvDisMapper.selectList(
new QueryWrapper().lambda()
.eq(IOStorInvDis::getIostorinvdtl_id, dto.getIostorinvdtl_id())
@@ -252,7 +259,7 @@ public class SelectOutServiceImpl extends ServiceImpl jsonMst = new HashMap<>();
diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue
index 41f481b..e5994df 100644
--- a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue
+++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue
@@ -100,6 +100,17 @@
>
退料确认
+
+ 空料确认
+
import crudCallMaterialDtl from '@/views/wms/pdm/callmaterialdtl/callmaterialdtl'
import WeighDialog from '@/views/wms/pdm/callmaterialdtl/WeighDialog'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
@@ -219,6 +230,16 @@ export default {
this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
+ },
+ empConfirm() {
+ const data = this.$refs.table.selection[0]
+ if (data.bom_status === '2') {
+ this.crud.notify('当前明细已确认！', CRUD.NOTIFICATION_TYPE.ERROR)
+ }
+ crudCallMaterialDtl.confirm(data).then(res => {
+ this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+ this.crud.toQuery()
+ })
}
}
}