lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 新增包装输送线手持绑定功能

Browse Source
This commit is contained in:
liyongde
2024-09-04 15:51:05 +08:00
parent 472543c6b7
commit 777c97ee58
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
View File

@@ -517,7 +517,10 @@ public class PdaServiceImpl implements PdaService {
.set(PdmBdWorkorder::getUpdate_name, SecurityUtils.getCurrentNickName()) .set(PdmBdWorkorder::getUpdate_name, SecurityUtils.getCurrentNickName())
.set(PdmBdWorkorder::getUpdate_time, DateUtil.now()) .set(PdmBdWorkorder::getUpdate_time, DateUtil.now())
.eq(PdmBdWorkorder::getWorkorder_id, workorderId); .eq(PdmBdWorkorder::getWorkorder_id, workorderId);
workorderService.update(lam); boolean update = workorderService.update(lam);
if (!update) {
throw new BadRequestException("工单完工失败");
}
return PdaResponseVo.pdaResultOk("工单完工成功"); return PdaResponseVo.pdaResultOk("工单完工成功");
} }

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
View File

@@ -178,6 +178,7 @@
<foreach collection="devices" item="code" separator="," open="(" close=")"> <foreach collection="devices" item="code" separator="," open="(" close=")">
#{code} #{code}
</foreach> </foreach>
AND wo.workorder_status <![CDATA[<>]]> '5'
</where> </where>
ORDER BY wo.create_time DESC ORDER BY wo.create_time DESC
</select> </select>

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
View File

@@ -95,6 +95,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
String nickName = SecurityUtils.getCurrentNickName(); String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now(); String now = DateUtil.now();
String today = DateUtil.format(DateUtil.date(), "yyyyMMdd"); String today = DateUtil.format(DateUtil.date(), "yyyyMMdd");
SchBasePoint point = pointService.getById(entity.getPoint_code());
// 点位编码和点位名称为父点位 // 点位编码和点位名称为父点位
entity.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr()); entity.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextIdStr());
entity.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER")); entity.setWorkorder_code(CodeUtil.getNewCode("PDM_SHIFTORDER"));
@@ -106,8 +107,9 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
entity.setUpdate_id(currentUserId); entity.setUpdate_id(currentUserId);
entity.setUpdate_name(nickName); entity.setUpdate_name(nickName);
entity.setUpdate_time(now); entity.setUpdate_time(now);
// 如果是分拣，就特殊处理 // 如果是分拣(并且点位不是分拣输送线)，就特殊处理
if (GeneralDefinition.AREA_FJ.equals(entity.getRegion_code())) { if (GeneralDefinition.AREA_FJ.equals(entity.getRegion_code())
&& !"6".equals(point.getPoint_type())) {
toCalculatePlannedQuantity(entity); toCalculatePlannedQuantity(entity);
} }
pdmBdWorkorderMapper.insert(entity); pdmBdWorkorderMapper.insert(entity);