转库修改

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1575,13 +1575,14 @@ public class LiteOrderCache {
                     task.setType(OP.CHECKOUT);
                     task.setType(OP.CHECKOUT);
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setLoc(TaskLocUtil.MW);
                     task.setLoc(TaskLocUtil.MW);
-                    task.setTicketCode(orderItem.getTicketCode());
+                    task.setTicketCode(orderNo);
                     task.setTicketItem(orderItem.getTicketItem());
                     task.setTicketItem(orderItem.getTicketItem());
                     task.setSourceType(LiteorderCheckType.TICKET_TRANSFER_CHECKOUT+"");
                     task.setSourceType(LiteorderCheckType.TICKET_TRANSFER_CHECKOUT+"");
 
 
                     if (StringUtils.isNotEmpty(barcode.getCartonId())) {
                     if (StringUtils.isNotEmpty(barcode.getCartonId())) {
                         task.setCartonId(barcode.getCartonId());
                         task.setCartonId(barcode.getCartonId());
                     }
                     }
+                    task.setWarehouseCode(StringUtils.isNotEmpty(orderItem.getDstWarehouse()) ? orderItem.getDstWarehouse() : orderItem.getSrcWarehouse());
 
 
                     taskService.addTaskToExecute(task);
                     taskService.addTaskToExecute(task);
                 }
                 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java

@@ -148,6 +148,11 @@ public class AgvDeviceController {
                         if (checkType.equals(task.getSourceType())){
                         if (checkType.equals(task.getSourceType())){
                             TicketPickPostData data = new TicketPickPostData(task.getTicketCode(),task.getTicketItem(),Arrays.asList(task.getCartonId()),"SWC");
                             TicketPickPostData data = new TicketPickPostData(task.getTicketCode(),task.getTicketItem(),Arrays.asList(task.getCartonId()),"SWC");
                             LuxsanApi.ticketPickPost(new TicketPickPostRequest(CommonUtil.plantCode,task.getTicketCode(),data));
                             LuxsanApi.ticketPickPost(new TicketPickPostRequest(CommonUtil.plantCode,task.getTicketCode(),data));
+                            Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
+                            if (barcode != null){
+                                barcode.setWarehouseCode(task.getWarehouseCode());
+                                barcodeManager.save(barcode);
+                            }
                         }
                         }
                     }
                     }
                 } else {
                 } else {
@@ -190,7 +195,7 @@ public class AgvDeviceController {
         palletUpdateRequest.setBIN_CODE("SWCT");
         palletUpdateRequest.setBIN_CODE("SWCT");
         palletUpdateRequest.setBIZ_TYPE("M");
         palletUpdateRequest.setBIZ_TYPE("M");
         palletUpdateRequest.setPLANT_CODE(CommonUtil.plantCode);
         palletUpdateRequest.setPLANT_CODE(CommonUtil.plantCode);
-        //LuxsanApi.palletUpdate(palletUpdateRequest);
+        LuxsanApi.palletUpdate(palletUpdateRequest);
 
 
 
 
         //已完成,从库存中清除,并且从完成队列中清除
         //已完成,从库存中清除,并且从完成队列中清除