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

rev：半成品出库优化

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-13 11:20:20 +08:00
parent ae846b5fd6
commit 9fa3e9b9a8
11 changed files with 80 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -47,36 +47,34 @@ import java.util.function.Consumer;
@Service
@Slf4j
public class AcsToWmsServiceImpl implements AcsToWmsService{
public class AcsToWmsServiceImpl implements AcsToWmsService {
public static Map<AcsTaskEnum, AbstractAcsTask> Task_Collent = new HashMap<>();
@Autowired
@Lazy
private TaskService taskService;
private TaskService taskService;
@Autowired
private CacheLineHandService cacheLineHandService;
private CacheLineHandService cacheLineHandService;
@Autowired
private IPdmProduceWorkorderService workorderService;
@Override
public Map<String, Object> apply(JSONObject param) {
Assert.notNull(param,"请求参数不能为空");
Assert.notNull(param, "请求参数不能为空");
Map result = MapOf.of("status", HttpStatus.OK.value(), "message", "ACS向WMS申请任务成功!");
AcsTaskEnum taskEnum = AcsTaskEnum.getType(param.getString("type"), "REQUEST_");
try {
RedissonUtils.lock(()->{
RedissonUtils.lock(() -> {
//业务处理
Task_Collent.get(taskEnum).createTask(param);
},param.getString("type"),5);
}catch (Exception ex){
log.error("acs申请任务失败:ex:{}",ex.getMessage());
}, param.getString("type"), 5);
} catch (Exception ex) {
log.error("acs申请任务失败:ex:{}", ex.getMessage());
result.put("status", HttpStatus.BAD_REQUEST.value());
result.put("message",ex.getMessage());
result.put("message", ex.getMessage());
}
return result;
}
@@ -85,12 +83,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
/**
* 更新缓存线的点位实时任务信息
* ACS给WMS发送缓存线的实时任务编号
*
* @param jsonObject position_code：缓存线点位编码 task_code：任务编号
*/
@Override
public JSONObject receiveTaskIdToCacheLine(JSONObject jsonObject) {
JSONObject result = new JSONObject();
HashMap<String,String> json = new HashMap<>(2);
HashMap<String, String> json = new HashMap<>(2);
try {
String task_code = jsonObject.getString("task_code");
String positionCode = jsonObject.getString("position_code");
@@ -100,8 +99,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
json.put("task_code", task_code);
//更新缓存线的点位实时任务信息
positionTab.update(json);
}
catch(Exception e) {
} catch (Exception e) {
result.put("status", 400);
result.put("message", e.getMessage());
}
@@ -139,6 +137,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
.build();
BussEventMulticaster.Publish(event);
if (status.equals(AcsTaskEnum.STATUS_CANNEL.getCode())) {
taskDto.setIs_delete("1");
taskService.update(taskDto);
}
/*AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
taskHandler.updateTaskStatus(row,status);*/
} catch (Exception e) {
@@ -182,8 +185,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
public Map<String, Object> washOrderFinish(JSONObject param) {
JSONObject result = new JSONObject();
try {
SpringContextHolder.getBean(WashMachineryTask.class).updateTaskStatus(param,StatusEnum.TASK_FINISH.getCode());
} catch (Exception e){
SpringContextHolder.getBean(WashMachineryTask.class).updateTaskStatus(param, StatusEnum.TASK_FINISH.getCode());
} catch (Exception e) {
result.put("status", 400);
result.put("message", e.getMessage());
return result;
@@ -200,18 +203,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
PdmProduceWorkorder workorder = new PdmProduceWorkorder();
workorder.setWorkorder_id(orderJson.getString("workorder_id"));
workorder.setWorkorder_status(orderJson.getString("status"));
if (orderJson.getBigDecimal("real_qty") != null){
if (orderJson.getBigDecimal("real_qty") != null) {
workorder.setDq_real_qty(orderJson.getBigDecimal("real_qty"));
}
if (orderJson.getString("status").equals(WorkerOrderEnum.PRODUCTING.getCode())){
if (orderJson.getString("status").equals(WorkerOrderEnum.PRODUCTING.getCode())) {
workorder.setRealproducestart_date(DateUtil.now());
}
if (orderJson.getString("status").equals(WorkerOrderEnum.COMPLETE.getCode())){
if (orderJson.getString("status").equals(WorkerOrderEnum.COMPLETE.getCode())) {
workorder.setWorkorder_status(WorkerOrderEnum.AUTO_COMPLETE.getCode());
workorder.setRealproduceend_date(DateUtil.now());
}
workorderService.updateById(workorder);
} catch (Exception e){
} catch (Exception e) {
log.error("工单状态更新失败:{}", e.getMessage());
result.put("status", 400);
result.put("message", e.getMessage());
@@ -235,11 +238,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
String start_time = param.getString("start_time");
String err_status_id = param.getString("error_code");//关联pdm_bi_devicerunerrorlink获取异常信息
JSONObject lastRecord = devRecordTab.query("device_code = '" + device_code + "' order by order_num desc limit 1").uniqueResult(0);
if (lastRecord!=null){
lastRecord.put("end_time",DateUtil.now());
if (lastRecord != null) {
lastRecord.put("end_time", DateUtil.now());
devRecordTab.update(lastRecord);
}
devRecordTab.insert(MapOf.of("record_id", IdUtil.getStringId(),"device_code",device_code,"status_type",status_type,"start_time",start_time,"err_status_id",err_status_id));
devRecordTab.insert(MapOf.of("record_id", IdUtil.getStringId(), "device_code", device_code, "status_type", status_type, "start_time", start_time, "err_status_id", err_status_id));
result.put("status", HttpStatus.OK.value());
result.put("message", "设备状态反馈成功");
return result;
@@ -249,15 +252,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
@Async
public void feedDevQty(Map param) {
WQLObject deviceTab = WQLObject.getWQLObject("pdm_bi_device");
if (CollectionUtils.isEmpty(param)){
if (CollectionUtils.isEmpty(param)) {
return;
}
Iterator iterator = param.keySet().iterator();
while (iterator.hasNext()){
String deviceCode = (String)iterator.next();
if (!StringUtils.isEmpty(deviceCode)){
while (iterator.hasNext()) {
String deviceCode = (String) iterator.next();
if (!StringUtils.isEmpty(deviceCode)) {
String qty = String.valueOf(param.get(deviceCode));
deviceTab.update(MapOf.of("deviceinstor_qty",qty),"device_code = '"+deviceCode+"'");
deviceTab.update(MapOf.of("deviceinstor_qty", qty), "device_code = '" + deviceCode + "'");
}
}
}
@@ -265,7 +268,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
@Override
public void feedcachelineVe(JSONObject param) {
WQLObject positionTab = WQLObject.getWQLObject("sch_cacheline_position");
if (param == null|| StringUtils.isBlank(param.getString("device_code")) || StringUtils.isBlank(param.getString("vehicle_code"))){
if (param == null || StringUtils.isBlank(param.getString("device_code")) || StringUtils.isBlank(param.getString("vehicle_code"))) {
return;
}
String cachelineCode = param.getString("device_code");
@@ -273,17 +276,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
String[] collect = cacheVehicle.split(",");
//order by layer_num,order_no ASC
JSONArray cachePositions = positionTab.query("cacheLine_code = '" + cachelineCode + "' order by layer_num,order_no ASC").getResultJSONArray(0);
if (cachePositions.size() != collect.length){
if (cachePositions.size() != collect.length) {
throw new BadRequestException("缓存线位置数量与acs返回数量不一致");
}
for (int i = 0; i < cachePositions.size(); i++) {
JSONObject cachePosition = (JSONObject) cachePositions.get(i);
String vehicleCode = collect[i];
cachePosition.put("vehicle_code",vehicleCode.equals("0")?"": vehicleCode);
if (vehicleCode.equals("99999")){
cachePosition.put("vehicle_code", vehicleCode.equals("0") ? "" : vehicleCode);
if (vehicleCode.equals("99999")) {
cachePosition.put("err_type", StatusEnum.CACHE_POINT_ERROR.getCode());
}
positionTab.update(cachePosition,"position_code = '"+cachePosition.getString("position_code")+"'");
positionTab.update(cachePosition, "position_code = '" + cachePosition.getString("position_code") + "'");
}
//更新缓存线及缓存线载具表对应关系
cacheLineHandService.cacheLineMaterSync(param.getString("cacheline_code"));
@@ -293,14 +296,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
@Async
public void feedOrderRealQty(JSONObject param) {
WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder");
if (CollectionUtils.isEmpty(param)){
if (CollectionUtils.isEmpty(param)) {
return;
}
Iterator<String> iterator = param.keySet().iterator();
while (iterator.hasNext()){
while (iterator.hasNext()) {
String workorderCode = iterator.next();
String real_qty = param.getString(workorderCode);
wo.update(MapOf.of("real_qty",real_qty),"workorder_code = '"+workorderCode+"'");
wo.update(MapOf.of("real_qty", real_qty), "workorder_code = '" + workorderCode + "'");
}
}
}

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/impl/DivRuleCpServiceImpl.java
View File

@@ -51,6 +51,7 @@ public class DivRuleCpServiceImpl implements DivRuleCpService {
.eq(StIvtStructattr::getStor_id, stor_id)
.eq(StIvtStructattr::getSect_id, sect_id)
.isNull(StIvtStructattr::getStoragevehicle_code)
.ne(StIvtStructattr::getStoragevehicle_code,"")
.eq(StIvtStructattr::getIs_used, "1") //TODO 暂时写死
.eq(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定"))
.orderByAsc(StIvtStructattr::getStruct_code)

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/StIvtCheckdtlBcp.java
View File

@@ -153,8 +153,7 @@ public class StIvtCheckdtlBcp implements Serializable {
* 处理时间
*/
private String process_time;
private String task_id;
}

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/dao/mapper/xml/StIvtCheckdtlBcpMapper.xml
View File

@@ -9,12 +9,14 @@
struct.sect_code,
mb.material_code,
mb.material_name,
user1.person_name AS process_optname
user1.person_name AS process_optname,
ivt.unit_weight
FROM
st_ivt_checkdtl_bcp CheckDtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
LEFT JOIN st_ivt_structivt_bcp ivt ON ivt.struct_id = struct.struct_id
<where>
1=1
<if test="map.check_id != '' and map.check_id != null">

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java
View File

@@ -78,7 +78,8 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
@Override
public Object pageQuery(CheckQuery query, PageQuery page) {
// 查询条件
page.setSort("check_code");
page.setSort("check_code,desc");
page.setIsAsc(true);
// 分页查询
Page<StIvtCheckmstBcp> pageQuery = this.page(page.build(), query.build());
TableDataInfo<StIvtCheckmstBcp> build = TableDataInfo.build(pageQuery);
@@ -271,9 +272,14 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
public void issueTask(JSONObject form) {
Assert.notNull(new Object[]{form, form.get("checkdtl_id")}, "请求参数不能为空");
StIvtCheckdtlBcp dtl = checkdtlBcpService.getById(form.getString("checkdtl_id"));
if (dtl.getIs_down().equals("1")) {
throw new BadRequestException("当前仓位的盘点移出任务已经下发!");
}
//查询可用的半成品移出点位
String point_code = "PD01";
StIvtCheckdtlBcp dtl = checkdtlBcpService.getById(form.getString("checkdtl_id"));
StIvtCheckmstBcp mst = this.getById(dtl.getCheck_id());
@@ -285,7 +291,6 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
.point_code2(point_code)
.vehicle_code(dtl.getStoragevehicle_code())
.product_area(mst.getWorkshop_id())
.callback((Consumer<String>) task_id -> dtl.setTask_id(task_id))
.build();
BussEventMulticaster.Publish(event);
@@ -296,6 +301,9 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl<StIvtCheckmstBcpMap
.set("status", CHECKEnum.DTL_STATUS.code("盘点中"))
.eq("struct_id", dtl.getStruct_id())
.eq("check_id", dtl.getCheck_id()));
mst.setStatus(CHECKEnum.BILL_STATUS.code("盘点中"));
this.updateById(mst);
}
@Override

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
View File

@@ -267,14 +267,19 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
String status = form.getString("status");
StIvtIostorinvBcp mst = this.getOne(new QueryWrapper<StIvtIostorinvBcp>().lambda().eq(StIvtIostorinvBcp::getTask_id, task_id));
if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) {
//完成
this.update(new UpdateWrapper<StIvtIostorinvBcp>().lambda().eq(StIvtIostorinvBcp::getTask_id, task_id)
.set(StIvtIostorinvBcp::getWork_status, IOSEnum.WORK_STATUS.code("完成")));
JSONObject mst_jo = new JSONObject();
mst_jo.put("iostorinv_id", mst.getIostorinv_id());
this.confirm(mst_jo);
} else {
} else if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())){
//执行中
this.update(new UpdateWrapper<StIvtIostorinvBcp>().lambda().eq(StIvtIostorinvBcp::getTask_id, task_id)
.set(StIvtIostorinvBcp::getWork_status, IOSEnum.WORK_STATUS.code("执行中")));
}else {
//
}
}