root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

手持fix

Browse Source
This commit is contained in:
psh
2024-06-04 17:07:08 +08:00
parent d266c99fb4
commit ea0ca05490
11 changed files with 287 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -103,6 +103,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AbstractTask task = taskFactory.getTask(requestMethodCode);
// 执行创建任务
task.apply(param);
// acs对接记录
interactRecordService.saveRecord(requestMethodName, param, result, GeneralDefinition.ACS_LMS);
} catch (Exception e) {
String message =e.getMessage();
log.error("ACS请求LMS出现错误: {}", message);
@@ -113,8 +115,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
noticeService.createNotice("异常信息：" + message, "acsApply: " + param.getString("request_medthod_code"),
NoticeTypeEnum.EXCEPTION.getCode());
}
// acs对接记录
interactRecordService.saveRecord(requestMethodName, param, result, GeneralDefinition.ACS_LMS);
return result;
}
@@ -161,12 +161,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
abstractTask.updateTaskStatus(taskCode, status);
result.setMessage("任务状态反馈成功!");
interactRecordService.saveRecord(requestMethodName, param, result, GeneralDefinition.ACS_LMS);
} catch (Exception e) {
log.error("任务状态更新失败: {}", message);
result.setCode(HttpStatus.HTTP_BAD_REQUEST);
result.setMessage("任务:[" + taskCode + "]状态更新失败," + message);
}
interactRecordService.saveRecord(requestMethodName, param, result, GeneralDefinition.ACS_LMS);
return result;
}
@@ -205,6 +206,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// id / code
String pointCode = task1.againApply(task.getString("task_id"));
result.setNext_point_code(pointCode);
// acs对接记录
interactRecordService.saveRecord(task.getString("request_method_name"), task, result, GeneralDefinition.ACS_LMS);
} catch (Exception e) {
String message = ObjectUtil.isEmpty(e.getMessage())
? ((InvocationTargetException) e).getTargetException().getMessage()
@@ -214,8 +217,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.setMessage(message);
result.setRequestNo(task.getString("requestNo"));
}
// acs对接记录
interactRecordService.saveRecord(task.getString("request_method_name"), task, result, GeneralDefinition.ACS_LMS);
return result;
}

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
View File

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.pda.service.PdaService;
import org.nl.wms.pda.service.dao.dto.ChangePointQtylDto;
import org.nl.wms.pda.service.dao.dto.ManualSortingDto;
import org.nl.wms.pda.service.dao.dto.SendMaterialDto;
import org.nl.wms.pda.service.dao.vo.DropdownListVo;
@@ -87,4 +88,18 @@ public class PdaController {
public ResponseEntity<List<DropdownListVo>> materialList(){
return new ResponseEntity<>(pdaService.getmaterialList(), HttpStatus.OK);
}
@PostMapping("/getGhsPointList")
@Log("固化室点位编码列表")
@ApiOperation("固化室点位编码列表")
public ResponseEntity<Object> getGhsPointList(){
return new ResponseEntity<>(pdaService.getGhsPointList(), HttpStatus.OK);
}
@PostMapping("/changePointQty")
@Log("更改库存")
@ApiOperation("更改库存")
public ResponseEntity<Object> changePointQty(@RequestBody ChangePointQtylDto changePointQtylDto){
return new ResponseEntity<>(pdaService.changePointQty(changePointQtylDto), HttpStatus.OK);
}
}

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

@@ -1,5 +1,6 @@
package org.nl.wms.pda.service;
import org.nl.wms.pda.service.dao.dto.ChangePointQtylDto;
import org.nl.wms.pda.service.dao.dto.ManualSortingDto;
import org.nl.wms.pda.service.dao.dto.SendMaterialDto;
import org.nl.wms.pda.service.dao.vo.*;
@@ -60,4 +61,8 @@ public interface PdaService {
* @return List<DropdownListVo>
*/
List<DropdownListVo> getmaterialList();
List<GhsPointVo> getGhsPointList();
PdaResponseVo changePointQty(ChangePointQtylDto changePointQtylDto);
}

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ChangePointQtylDto.java Normal file
View File

@@ -0,0 +1,15 @@
package org.nl.wms.pda.service.dao.dto;
import lombok.Data;
@Data
public class ChangePointQtylDto {
/**
* 组盘号
*/
private String group_id;
/**
* 物料数量
*/
private Integer qty;
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
View File

@@ -1,9 +1,6 @@
package org.nl.wms.pda.service.dao.mapper;
import org.nl.wms.pda.service.dao.vo.DropdownListVo;
import org.nl.wms.pda.service.dao.vo.ManualWorkOrderVo;
import org.nl.wms.pda.service.dao.vo.MaterialInventoryVo;
import org.nl.wms.pda.service.dao.vo.TaskShowVo;
import org.nl.wms.pda.service.dao.vo.*;
import org.nl.wms.sch.point.service.dto.SchBasePointDto;
import java.util.List;
@@ -44,4 +41,8 @@ public interface PdaMapper {
List<SchBasePointDto> getPointList();
List<GhsPointVo> getGhsPointList();
void changePointQty(String group_id,int qty);
}

20
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
View File

@@ -87,4 +87,24 @@
LEFT JOIN sch_base_point p1 ON p1.point_code = p.parent_point_code AND p1.point_type = '1' AND p1.region_code = 'TBX'
WHERE p.point_type = 2 AND p.region_code = 'TBX' AND p.can_vehicle_type = '1'
</select>
<select id="getGhsPointList" resultType="org.nl.wms.pda.service.dao.vo.GhsPointVo">
SELECT
p.point_code,
v.group_id,
m.material_name,
v.material_qty
FROM
sch_base_point p,
sch_base_vehiclematerialgroup v,
md_base_material m
WHERE
p.region_code = 'GH'
AND p.vehicle_code = v.vehicle_code
</select>
<update id="changePointQty">
update sch_base_vehiclematerialgroup set material_qty= #{qty}
where group_id = #{group_id}
</update>
</mapper>

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/GhsPointVo.java Normal file
View File

@@ -0,0 +1,11 @@
package org.nl.wms.pda.service.dao.vo;
import lombok.Data;
@Data
public class GhsPointVo {
private String point_code;
private String vehicle_name;
private String group_id;
private String material_qty;
}

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

@@ -8,6 +8,7 @@ import org.nl.common.exception.BadRequestException;
import org.nl.wms.database.material.service.IMdBaseMaterialService;
import org.nl.wms.database.material.service.dao.MdBaseMaterial;
import org.nl.wms.pda.service.PdaService;
import org.nl.wms.pda.service.dao.dto.ChangePointQtylDto;
import org.nl.wms.pda.service.dao.dto.ManualSortingDto;
import org.nl.wms.pda.service.dao.dto.SendMaterialDto;
import org.nl.wms.pda.service.dao.mapper.PdaMapper;
@@ -121,6 +122,10 @@ public class PdaServiceImpl implements PdaService {
return pdaMapper.getPointList();
}
@Override
public List<GhsPointVo> getGhsPointList(){
return pdaMapper.getGhsPointList();
}
@Override
public List<TaskShowVo> coatedWireIntoStorageTaskShow() {
return pdaMapper.getRunningTaskByConfigAndCreateMode("TBXMLTask", GeneralDefinition.PDA_CREATION);
@@ -135,4 +140,10 @@ public class PdaServiceImpl implements PdaService {
public List<DropdownListVo> getmaterialList() {
return pdaMapper.getmaterialList();
}
@Override
public PdaResponseVo changePointQty(ChangePointQtylDto changePointQtylDto){
pdaMapper.changePointQty(changePointQtylDto.getGroup_id(),changePointQtylDto.getQty());
return PdaResponseVo.pdaResultOk("固化室点位库存数量更新成功");
}
}

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/tbx/TBXMLTask.java
View File

@@ -117,6 +117,7 @@ public class TBXMLTask extends AbstractTask {
/**
* 不创建半条任务，直接创建完整任务
*
* @param task
*/
@Override
@@ -291,7 +292,7 @@ public class TBXMLTask extends AbstractTask {
: "");
groupEntity.setMaterial_qty(ObjectUtil.isNotEmpty(qty) && qty > 0
? qty
: Integer.valueOf(materialObj.getStandard_qty()));
: ObjectUtil.isEmpty(materialObj.getMaterial_spec()) ? 0 : Integer.parseInt(materialObj.getMaterial_spec()) * 11);
groupEntity.setCreate_id(GeneralDefinition.ACS_ID);
groupEntity.setCreate_name(GeneralDefinition.ACS_NAME);
groupEntity.setCreate_time(DateUtil.now());
@@ -393,10 +394,11 @@ public class TBXMLTask extends AbstractTask {
/**
* 再次请求
*
* @param task_id: 任务标识
* @return
*/
public String againApplyLocal(SchBaseTask task,String waitPoint,String task_id) {
public String againApplyLocal(SchBaseTask task, String waitPoint, String task_id) {
if (ObjectUtil.isEmpty(task)) {
throw new BadRequestException("任务：[" + task_id + "]不存在!");
}
@@ -446,7 +448,7 @@ public class TBXMLTask extends AbstractTask {
throw new BadRequestException("找不到任务：[" + task_id + "]等待点!");
}
if (ObjectUtil.isNotEmpty(task.getPoint_code2())) {
log.info("该任务{}已经二次分配完毕，直接反馈之前计算点位{}",task.getTask_code(),task.getPoint_code2());
log.info("该任务{}已经二次分配完毕，直接反馈之前计算点位{}", task.getTask_code(), task.getPoint_code2());
return task.getPoint_code2();
}
// 根据任务上等待点的位置获取准确的固化室位置。