Commit 1244eeb7 LN

detial按钮修改

1 个父辈 1ad6c7d8
......@@ -28,4 +28,9 @@ public class SelReelDetialDto implements Serializable {
@ApiModelProperty("linePrepId")
private String linePrepId;
@ApiModelProperty("显示detial按钮")
private boolean showDetialBtn=false;
}
......@@ -62,6 +62,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class MicronDispatchController {
private String ShowDetialBtn="PN Search";
@Autowired
private ILiteOrderManager liteOrderManager;
@Autowired
......@@ -216,7 +217,8 @@ public class MicronDispatchController {
if(ObjectUtil.isEmpty(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);
reelDetialDtos.add(dto);
......@@ -244,7 +246,8 @@ public class MicronDispatchController {
if(hasBarcodes.contains( pos.getBarcode().getBarcode())){
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);
}
}
......@@ -502,6 +505,7 @@ public class MicronDispatchController {
LiteOrder liteOrder = new LiteOrder(orderName, items);
liteOrder.setOperationId(taskDto.getOperationId());
liteOrder.setMode(mode);
liteOrder.setSource(ShowDetialBtn);
log.info("pnSubmit,mode=[" + mode + "],[" + taskDto.getOperationId() + "], 新增加订单:" + liteOrder.getOrderNo() + ",共" + items.size() + "条工单详情");
liteOrder = liteOrderManager.createWithItems(liteOrder);
liteOrderCache.addOrderToMap(liteOrder);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!