wms / wms4_andelichi · Commits

Commit ccf5b4eccb7cf9bdbb4a0d0475ec9e173481cd45

Authored by 肖超群
1 parent 50792df1

增加mes部分代码

Inline Side-by-side
Showing 1 changed file with 12 additions and 0 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
  View file @ccf5b4e
... ... @@ -25,9 +25,12 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
25 25 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
26 26 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
27 27 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
  28 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
28 29 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
  30 +import org.jeecg.modules.wms.task.taskHeader.service.ITaskDetailService;
29 31 import org.jeecg.utils.StringUtils;
30 32 import org.springframework.stereotype.Service;
  33 +import org.springframework.transaction.annotation.Transactional;
31 34  
32 35 import javax.annotation.Resource;
33 36 import java.lang.ref.WeakReference;
... ... @@ -61,12 +64,15 @@ public class MesServiceImpl implements IMesService {
61 64 private IShipmentContainerDetailService shipmentContainerDetailService;
62 65 @Resource
63 66 private IShipmentContainerHeaderService shipmentContainerHeaderService;
  67 + @Resource
  68 + private ITaskDetailService taskDetailService;
64 69  
65 70 /**
66 71 * 要求入库单详情 必须是不重样的
67 72 * @return
68 73 */
69 74 @Override
  75 + @Transactional(rollbackFor = Exception.class)
70 76 public Result receiptMaterial(MesReceiptMaterial mesReceiptMaterial, String warehouseCode) {
71 77 List<Receive> receiveList = new ArrayList<>();
72 78 String referCode = mesReceiptMaterial.getReferCode();
... ... @@ -124,6 +130,7 @@ public class MesServiceImpl implements IMesService {
124 130 }
125 131  
126 132 @Override
  133 + @Transactional(rollbackFor = Exception.class)
127 134 public Result shipmentMaterial(MesShipmentMaterial mesShipmentMaterial, String warehouseCode) {
128 135 String referCode = mesShipmentMaterial.getReferCode();
129 136 String toPort = mesShipmentMaterial.getToPort();
... ... @@ -200,12 +207,17 @@ public class MesServiceImpl implements IMesService {
200 207 }
201 208  
202 209 @Override
  210 + @Transactional(rollbackFor = Exception.class)
203 211 public Result backMesReceipt(TaskHeader taskHeader) {
  212 + List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskHeader.getId());
  213 + for(TaskDetail taskDetail : taskDetailList) {
204 214  
  215 + }
205 216 return null;
206 217 }
207 218  
208 219 @Override
  220 + @Transactional(rollbackFor = Exception.class)
209 221 public Result backMesShipment(TaskHeader taskHeader) {
210 222 return null;
211 223 }
... ...