diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java index 1632f9ee..8652dd49 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java @@ -111,7 +111,6 @@ public class FlourworkServiceImpl implements FlourworkService { } @Override - @Transactional(rollbackFor = Exception.class) public void calledMater(JSONObject whereJson) { JSONObject dtlData = whereJson.getJSONObject("dtlData"); String formuladtl_id = dtlData.getString("formuladtl_id"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 9a73872c..9dafe8c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -929,7 +929,6 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { } @Override - @Transactional(rollbackFor = Exception.class) public void handdown(JSONObject whereJson) { //移库单主表 WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_MoveInv"); @@ -984,6 +983,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { throw new BadRequestException("任务下发失败,请稍后重试!"); } } + HashMap map = new HashMap<>(); map.put("bill_status", "20"); wo_mst.update(map, "moveinv_id='" + moveinv_id + "'"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java index 6c4b7573..c965e72f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java @@ -20,7 +20,6 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { * @param status 代表wcs任务完成状态: //1:执行中,2:完成 ,3:acs取消 */ @Override - @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { //任务表 WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); diff --git a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml index 7bcceabf..bcc2752a 100644 --- a/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml +++ b/mes/hd/nladmin-system/src/main/resources/log/MesToErp.xml @@ -3,7 +3,7 @@ - http://10.16.1.24:9200/_bulk + http://127.0.0.1:9200/_bulk ${esIndex} whxr_log es-logger