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

mes接口更新，英莱机械手更新

Browse Source
This commit is contained in:
loujf
2023-02-13 14:23:37 +08:00
parent 2d2c4116ff
commit ccc01ad78a
9 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
@Service
@@ -696,6 +697,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
taskObj.put("producetask_status", "04");
if (StrUtil.equals("FJJXS1", device_code) || StrUtil.equals("FJJXS2", device_code) || StrUtil.equals("FJJXS3", device_code)) {
//调用mes接口
HashMap map = new HashMap();
map.put("producetask_code",producetask_code);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
wmsToJnServiceImpl.feedBackPackWordShop(map);
}
}
if (StrUtil.equals("2", type)) {
taskObj.put("producetask_status", "05");

9
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql
View File

@@ -18,6 +18,7 @@
输入.task_id TYPEAS s_string
输入.record_id TYPEAS s_string
输入.vehicle_code TYPEAS s_string
输入.producetask_code TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -318,14 +319,14 @@ ENDIF
IF 输入.flag = "15"
QUERY
SELECT DISTINCT
group.vehicle_code AS STOCKNO,
group.task_id AS ID
vehiclegroup.vehicle_code AS STOCKNO,
vehiclegroup.task_id AS ID
FROM
st_buss_vehiclegroup group
st_buss_vehiclegroup vehiclegroup
where
1=1
OPTION 输入.vehicle_code <> ""
group.vehicle_code = 输入.vehicle_code
vehiclegroup.vehicle_code = 输入.vehicle_code
ENDOPTION
ENDSELECT
ENDQUERY

13
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/service/impl/CheckOutServiceImpl.java
View File

@@ -12,6 +12,7 @@ import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SecurityUtils;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
import org.nl.wms.pda.checkout.service.CheckOutService;
import org.nl.wms.sch.manage.AreaEnum;
import org.nl.wms.sch.manage.BillTypeEnum;
@@ -21,6 +22,7 @@ import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
@Service
@@ -44,7 +46,7 @@ public class CheckOutServiceImpl implements CheckOutService {
}
@Override
public Map<String, Object> Confirm( JSONObject param) {
public Map<String, Object> Confirm(JSONObject param) {
String point_id = param.getString("point_id");
String point_code = param.getString("point_code");
@@ -96,12 +98,19 @@ public class CheckOutServiceImpl implements CheckOutService {
param.put("struct_id",point_id);
ivtService.addIvtFlow(param, IvtChangeTypeEnum.SUB_IVT_AND_CAN_USE);
// 删除阻盘信息
groupTab.delete("vehicle_code = '" +ivtObj.getString("vehicle_code")+"'" );
groupTab.delete("vehicle_code = '" + ivtObj.getString("vehicle_code")+"'" );
// 点位状态更新
JSONObject object = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0);
object.put("point_status", "00");
object.put("vehicle_code", "");
pointTab.update(object);
//调用mes接口
HashMap map = new HashMap();
map.put("vehicle_code",ivtObj.getString("vehicle_code"));
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
wmsToJnServiceImpl.feedBackTrayBak(map);
JSONObject returnjo = new JSONObject();
returnjo.put("code", "1");
returnjo.put("desc", "操作成功！");

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -147,7 +147,7 @@ public class CallMaterialTask extends AbstractAcsTask {
if (StrUtil.equals(point_type, AreaEnum.CYHCHJ.getCode())) {
wmsToJnServiceImpl.feedBackOutWait(jo);
}
if (StrUtil.equals(point_type, AreaEnum.MTPQ.getCode())) {
if (StrUtil.equals(point_type, AreaEnum.BTHCQ.getCode())) {
wmsToJnServiceImpl.feedBackOutPartStock(jo);
}
}

7
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java
View File

@@ -16,6 +16,7 @@ import org.nl.wms.BussConstant;
import org.nl.wms.WorkProcedureEnum;
import org.nl.wms.common.PointUpdateUtil;
import org.nl.wms.common.StructFindUtil;
import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.AreaEnum;
import org.nl.wms.sch.manage.TaskStatusEnum;
@@ -85,6 +86,12 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
pointTab.update(startPointObj);
taskTab.update(jsonTask);
//调用mes接口
HashMap hashMap = new HashMap();
hashMap.put("vehicle_code",vehicle_code);
WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl();
wmsToJnServiceImpl.feedBackTrayBak(hashMap);
//将组盘表删除
WQLObject group_Table = WQLObject.getWQLObject("st_buss_vehiclegroup");
JSONObject groupObj = group_Table.query("vehicle_code='" + vehicle_code + "' and is_delete='0'").uniqueResult(0);

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java
View File

@@ -138,7 +138,7 @@ public class SendMaterialTask extends AbstractAcsTask {
if (StrUtil.equals(area_type, AreaEnum.CYHCHJ.getCode())) {
wmsToJnServiceImpl.feedBackInWait(jo);
}
if (StrUtil.equals(area_type, AreaEnum.MTPQ.getCode())) {
if (StrUtil.equals(area_type, AreaEnum.BTHCQ.getCode())) {
wmsToJnServiceImpl.feedBackInPartStock(jo);
}