detial按钮修改

src/main/java/com/neotel/smfcore/custom/micron1053/loading/dto/SelReelDetialDto.java

@@ -28,4 +28,9 @@ public class SelReelDetialDto implements Serializable {
 
 
     @ApiModelProperty("linePrepId")
     @ApiModelProperty("linePrepId")
     private String linePrepId;
     private String linePrepId;
+
+
+    @ApiModelProperty("显示detial按钮")
+    private boolean showDetialBtn=false;
+
 }
 }

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java

@@ -62,6 +62,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class MicronDispatchController {
 public class MicronDispatchController {
 
 
+    private String ShowDetialBtn="PN Search";
     @Autowired
     @Autowired
     private ILiteOrderManager liteOrderManager;
     private ILiteOrderManager liteOrderManager;
     @Autowired
     @Autowired
@@ -216,7 +217,8 @@ public class MicronDispatchController {
                 if(ObjectUtil.isEmpty(lineId)){
                 if(ObjectUtil.isEmpty(lineId)){
                     lineId="";
                     lineId="";
                 }
                 }
-                SelReelDetialDto dto = new SelReelDetialDto(selItem.getPn(), selItem.getRi(), selItem.getOutNum(), selItem.getStatus(), selItem.getExecutFailReason(),lineId);
+                boolean showBtn=!order.getSource().equalsIgnoreCase(ShowDetialBtn);
+                SelReelDetialDto dto = new SelReelDetialDto(selItem.getPn(), selItem.getRi(), selItem.getOutNum(), selItem.getStatus(), selItem.getExecutFailReason(),lineId,showBtn);
 
 
                 dto.setLinePrepId(lineId);
                 dto.setLinePrepId(lineId);
                 reelDetialDtos.add(dto);
                 reelDetialDtos.add(dto);
@@ -244,7 +246,8 @@ public class MicronDispatchController {
                     if(hasBarcodes.contains( pos.getBarcode().getBarcode())){
                     if(hasBarcodes.contains( pos.getBarcode().getBarcode())){
                         continue;
                         continue;
                     }
                     }
-                    SelReelDetialDto dto = new SelReelDetialDto(pos.getBarcode().getPartNumber(), pos.getBarcode().getBarcode(), pos.getBarcode().getAmount(), "", "","");
+                    boolean showBtn=!order.getSource().equalsIgnoreCase(ShowDetialBtn);
+                    SelReelDetialDto dto = new SelReelDetialDto(pos.getBarcode().getPartNumber(), pos.getBarcode().getBarcode(), pos.getBarcode().getAmount(), "", "","",showBtn);
                     reelDetialDtos.add(dto);
                     reelDetialDtos.add(dto);
                 }
                 }
             }
             }
@@ -502,6 +505,7 @@ public class MicronDispatchController {
             LiteOrder liteOrder = new LiteOrder(orderName, items);
             LiteOrder liteOrder = new LiteOrder(orderName, items);
             liteOrder.setOperationId(taskDto.getOperationId());
             liteOrder.setOperationId(taskDto.getOperationId());
             liteOrder.setMode(mode);
             liteOrder.setMode(mode);
+            liteOrder.setSource(ShowDetialBtn);
             log.info("pnSubmit,mode=[" + mode + "],[" + taskDto.getOperationId() + "], 新增加订单:" + liteOrder.getOrderNo() + "，共" + items.size() + "条工单详情");
             log.info("pnSubmit,mode=[" + mode + "],[" + taskDto.getOperationId() + "], 新增加订单:" + liteOrder.getOrderNo() + "，共" + items.size() + "条工单详情");
             liteOrder = liteOrderManager.createWithItems(liteOrder);
             liteOrder = liteOrderManager.createWithItems(liteOrder);
             liteOrderCache.addOrderToMap(liteOrder);
             liteOrderCache.addOrderToMap(liteOrder);